Fixes 'n stuff
Merge branch 'master' of https://github.com/EdenSG/Allies

Conflicts:
	3-4_1.txt