delete a bunch of stuff
Merge branch 'master' of https://github.com/caresa/rps_2