merge new_render changes. they'll be helpful when placing props
prof bell is real. used transparent image for door, lock, and lightswitch
merge with master, conflicts
merge master -> shooter/real-people
Merge pull request #128 from rcatlin/shooter/real-people

[Active Shooter] real people
Merge branch 'master' of github.com:rcatlin/Emergency-Response into library-office-fixes
Merge branch 'library-office-fixes' of github.com:rcatlin/Emergency-Response into library-office-fixes
Merge branch 'library-office-fixes' of github.com:rcatlin/Emergency-Response into library-office-fixes