edited again
sup bitches
Merge branch 'master' of https://github.com/brohanster/The-Real-Deal.git

Conflicts:
	The_Real_Deal/bin/com/ror/GdxGame/GdxGame.class
	The_Real_Deal/src/com/ror/GdxGame/GdxGame.java
hue hue troll
no
Merge branch 'master' of https://github.com/brohanster/The-Real-Deal.git

Conflicts:
	The_Real_Deal-desktop/bin/.gitignore
	The_Real_Deal/bin/com/ror/GdxGame/GdxGame.class
	The_Real_Deal/src/com/ror/GdxGame/GdxGame.java
	The_Real_Deal/src/com/ror/GdxGame/MainMenuScreen.java