Including spawn locations in scary locations
Merge branch 'master' of github.com:paulheideman/oc-freddy