win message
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