Merge branch 'master' of github.com:Lusito/GameDevWeek
Merge branch 'master' of github.com:Lusito/GameDevWeek
minor fixes
Merge branch 'master' of github.com:Lusito/GameDevWeek