Wem commit
Merge branch 'master' of https://github.com/RoDoRiTos/Game-Jam-2014-08