Not sure why I need to commit this.
Conflict fix
Fixes to first fight.
Some more tweaks.
Merge branch 'master' of https://github.com/WahStudios/EvilBad_Ep1 into Tempbranch