Fixing a few bugs
Merge branch 'master' of https://github.com/XtremePrime/LudumDare28.git