test scenes
Merge branch 'Travis-Branch'
lemmings
Merge branch 'James'
reset stuff
quick changes
Animations
lemmings work
Merge branch 'Travis'
Merge branch 'master' into James