Maps 2
Merge branch 'master' of https://github.com/rascheel/Cpre388Project
Maps are done!