Moved out all locations to a new file
Merge branch 'master' of github.com:seikochan/ICS313