added some things
Merge branch 'master' of https://github.com/johannesboyne/howtousegit into tower_hotfix
merged and added