Final Project - game v1.0

Screwed up locations.js... let's try a revert.