last tweaks
Merge branch 'master' of https://github.com/RRH707/Gamejam2014-G6-