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.
Small changes, made ledges spawn for height of screen
Merge remote-tracking branch 'aroth4Fetch/master'

Conflicts:
	Unbearable/.classpath
Added a scrolling background for the game
-GamePanel
	-Ledges work correctly now, as far as I know..

-MainActivity
	-added API check because getActionBar is only in API 11 and above

-Player
	-increased jump height a little
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
Game win state backbone in
Merge commit '60d6ae4976d2b8534d607492e8e984ee4ee6f77c'
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.

Conflicts:
	Unbearable/src/edu/ycp/cs/cs496/unbearable/GamePanel.java
Had to Cherry pick these changes from Nick cause egit is bad.

-GamePanel
	-Ledges work correctly now, as far as I know..

-MainActivity
	-added API check because getActionBar is only in API 11 and above

-Player
	-increased jump height a little

Conflicts:
	Unbearable/.classpath
	Unbearable/src/edu/ycp/cs/cs496/unbearable/GamePanel.java
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.

wat
Flying Shark, transparent bear, and flipped images, oh my!
Fixed bear falling, classpath here will probably break things though