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
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.

wat
Fixed bear falling, classpath here will probably break things though