git conflict solving
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git