commit
Friday meeting commit.  Worked on the LevelSelectManager
fix commit
Merge remote-tracking branch 'origin/Russell-xmlParser'

Conflicts:
	.idea/libraries/ComAndroidSupportAppcompatV71901_aar.xml
	app/src/main/java/com/example/logicSquarePants/game/MainActivity.java
Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants

Conflicts:
	app/app.iml
	app/src/main/java/com/example/logicSquarePants/data/SpriteManager.java
	app/src/main/java/com/example/logicSquarePants/data/XMLParser.java
	app/src/main/java/com/example/logicSquarePants/game/MainActivity.java
	app/src/main/res/xml/level1.xml
Nothing changed, cannot pull without committing beforehand for some reason.
Fixed merge
seperated menu state from game state
Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants

Conflicts:
app/src/main/java/com/example/app/data/SpriteManager.java
app/src/main/java/com/example/logicSquarePants/data/DataModel.java
Revert "Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants"

This reverts commit 4f4a635208d34827b819cdebca7efdb7afa8a3d7.
Revert "Revert "Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants""

This reverts commit 0692e66a6ba98dcdd5ef9fc99a207a6f3740f73b.
Revert "Revert "Revert "Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants"""

This reverts commit 68dfac64a7113bc6153cda05ab15d6ca89966ac4.
commit
commit again :)
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
Revert daa3f83..6d6e545

This rolls back to commit daa3f837e6ddd5f5156c3f59825afeead5722659.
commit
Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants
Sound
Conflicts:
	app/app.iml
Merge branch 'good_branch' of https://github.com/SpruceGoose429/LogicSquarePants

Conflicts:
	app/app.iml
	app/src/main/java/com/example/logicSquarePants/game/DrawView.java
Merge branch 'master' of https://github.com/SpruceGoose429/LogicSquarePants into good_branch

Conflicts:
	.idea/libraries/appcompat_v7_19_0_1.xml