fucking finally walls and trees are now obstructions
added another obstruction
fixed conflict; ignorefile
Merge branch 'dev-new' of https://github.com/our-really-lame-final-project/Project into dev-new
modified ignore