The correct merge with the win screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/com/example/logicSquarePants/data/DataModel.java
	app/src/main/java/com/example/logicSquarePants/data/SpriteManager.java
	app/src/main/java/com/example/logicSquarePants/game/MainActivity.java
	app/src/main/java/com/example/logicSquarePants/gui/LevelSelectManager.java