re added kenjis bug hehehe fix
Merge branch 'master' into fixing_more_stuff
making sure nothing breaks i think
Merge pull request #104 from red-admirals-2014/fixing_more_stuff

Fixing more stuff