Changes!
HELP MERGE CONFLICTS ARE KILLING MES D:
Merge branch 'master' of https://github.com/Elfy23/Cirno

Conflicts:
	src/GameplayState.java
Maps fixed + new map!