cleanup
Merge branch 'master' of https://github.com/RobSis/quake-portal-gun