Add obstructions and make saddies respect them
Merge branch 'master' of github.com:cedophile/global-game-jam-2013

Conflicts:
	main.lua
Merge branch 'master' of github.com:cedophile/global-game-jam-2013