add obstacle object and creation
Merge branch 'master' of https://github.com/samphippen/ggj2013

Conflicts:
	ggj2013-desktop/bin/data/constants.txt
Merge branch 'master' of https://github.com/samphippen/ggj2013