Merge remote-tracking branch 'nlay/master'

Conflicts:
	Unbearable/res/drawable-nodpi/playgameunselected.png
	Unbearable/res/drawable-nodpi/quitgameunselected.png
	Unbearable/src/edu/ycp/cs/cs496/unbearable/GamePanel.java
Got rid of unnecessary jar file and changed some stuff
blah
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
-added mama bear
-added bear death from shark

Merge remote-tracking branch 'aroth4Fetch/master'

Conflicts:
	Unbearable/AndroidManifest.xml
	Unbearable/src/edu/ycp/cs/cs496/unbearable/GamePanel.java
	Unbearable/src/edu/ycp/cs/cs496/unbearable/MainActivity.java
	Unbearable/src/edu/ycp/cs/cs496/unbearable/model/Login.java