Materials, moved passengers to proper position
Merge branch 'develop' of github.com:StirfireStudios/ggj2014 into develop