commit before pull from semvid
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game
Integrated some stuff to show what we have done