fix #129 fix#130
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game