Dom/Craig - First commit suckers! Made the player animate constantly.
Dom/Craig - Player can no longer move left, right, or down.
Tyler/Dom - Fixed merge conflict at end of night. Forgot to change the test to new origin in middle of screen
Fixed poor formatting
Dom/Craig: Removed the cactus obstacle.
Dom/Craig - Started implementing jump algorithm. Tests broken. http://gamedev.stackexchange.com/questions/29617/how-to-make-a-character-jump
Revert "Dom/Craig - Started implementing jump algorithm. Tests broken. http://gamedev.stackexchange.com/questions/29617/how-to-make-a-character-jump"

This reverts commit ffb6b8e7914bef748e358a0a12f6dabac481054a.
merging conflicts