Typo, missing 'a'
Updated Coding Conventions (markdown)
Small fix about updating branch
Add tip about rebasing
Initial draft