Added obstacle collisions
Merge remote-tracking branch 'origin/master'

Conflicts:
	ggj2013-desktop/bin/data/constants.txt
	ggj2013/src/com/samphippen/games/ggj2013/ObstacleObject.java