no new changes
Merge remote-tracking branch 'Aaron/master'

Conflicts:
	Unbearable/.classpath
	Unbearable/libs/modelClasses.jar
	Unbearable/src/edu/ycp/cs/cs496/unbearable/MainActivity.java
Merge remote-tracking branch 'aroth4Fetch/master'

Conflicts:
	Unbearable/res/drawable-nodpi/playgameunselected.png
	Unbearable/res/drawable-nodpi/quitgameunselected.png
	Unbearable/src/edu/ycp/cs/cs496/unbearable/GamePanel.java
fix this if you can nick
Merge remote-tracking branch 'neocrimson17Fetch/master'
Fixed Images and their rendering orientation
Got the login client side working, added quit button detection, and some
additional game state changes for optimality

Conflicts: (fixed)
	Unbearable/res/drawable-nodpi/playgameunselected.png
	Unbearable/res/drawable-nodpi/quitgameunselected.png