added some changes to git-collab tutorial
Merge branch 'gh-pages' of https://github.com/douglatornell/2013-09-26-ubc into gh-pages
Reworked the git collaborative tutorial