CRA-541: Changed procedure by now merging branch into master before pulling from upstream, and then committing before pushing to origin. Also added graphical illustration of process.
Merge branch 'master' of git://github.com/CRAVA/crava
Merge pull request #17 from RagnarHauge/master

CRA-541: Update working procedure for Git/GitHub