fixed few things up
Merge branch 'master' of github.com:Cyberbully/COMP1927-2014x1-Help