test
Merge branch 'master' of https://github.com/EdenSG/Allies

Conflicts:
	1-3.txt
	1-4_1.txt