Merge commit '9946df4928c33a8d8c65e32d379facbf0aa2a134'
Registration Servlet is working, rejoice!
Merge commit '69e4c20d9f32a5d40ec617ad07e387da6ca709cc'
-added preliminary Icicle
Fixed the game's ledges boundaries
Merge remote-tracking branch 'neocrimson17Fetch/master'
-added icicles
Merge remote-tracking branch 'aroth4Fetch/master'
git results in error so I'm testing
merging
Merge remote-tracking branch 'Aaron/master'
need to solve the conflicting return statement of login and registration
-added a Collectible class, game keeps track of how many 'fish' the
player collects
-other misc changes
Login works for derby, but registration still cannot store username and
password for some reason
-Icicles will NOT kill the bear if it has collected a fish
-Fish will decrement for every icicle that hits the bear
-Bear will die if Fish = 0 and is hit by an icicle
-Bear will always die when eaten by the shark
Login works for derby, but registration still cannot store username and
password for some reason

Conflicts:
	Unbearable/src/edu/ycp/cs/cs496/unbearable/AsyncPost.java
	UnbearablePersistence/src/edu/ycp/cs/cs496/unbearable/model/persist/DerbyDatabase.java
	UnbearableWebService/.classpath
Merge remote-tracking branch 'neocrimson17Fetch/master'

Conflicts:
	UnbearablePersistence/src/edu/ycp/cs/cs496/unbearable/model/persist/DerbyDatabase.java
Fixed the registration servlet so it works with derby now