some changes
Merge branch 'master' of https://github.com/FortressStudio/2DProject

Conflicts:
	EX.txt