Added traps and powerups, improved progress bars
test
Merge branch 'josh' into developer