test
Merge remote-tracking branch 'nlay/master'

Conflicts:
	Unbearable/.classpath
Fixed: conflict and .jar files
Jars
Merge remote-tracking branch 'nlay/master'
Adding code to implement screen scrolling for the game
Changes to implement scrolling for da bear
Merge remote-tracking branch 'nlay/master'

Conflicts:
	UnbearableControllers/.classpath
Merge remote-tracking branch 'hdao/master'

Conflicts:
	Unbearable/src/edu/ycp/cs/cs496/unbearable/MainActivity.java
Implemented randomly placed ledges and side scrolling functionality
Jar
Maintenance stuff
Tried fixing the login issue with jackson files missing.  Eclipse is
being difficult.
Merge fix
Merge branch 'master' of git@github.com:aroth4/Unbearable.git

Conflicts:
	Unbearable/.classpath
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'