server side login tested successfully.  It should be working fine now
there are still some problems on the client side of the login
Merge remote-tracking branch 'neocrimson17Fetch/master'
Merge remote-tracking branch 'neocrimson17Fetch/master'

Conflicts:
	Unbearable/.classpath
	Unbearable/libs/modelClasses.jar
	Unbearable/src/edu/ycp/cs/cs496/unbearable/MainActivity.java
Merge remote-tracking branch 'origin/master'
Updates for Ledges
stupid eclipse is stupid.
Merge remote-tracking branch 'nlay/master'

Conflicts:
	Unbearable/.classpath
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
Added a scrolling background for the game
Added multiple game states, and touch control for the bear.  Game update
and draw methods have been updated to work with game states as well.
Merge branch 'master' of git@github.com:aroth4/Unbearable.git

Conflicts:
	Unbearable/.classpath