Location bugfixes
Merge branch 'master' of https://github.com/ebeachly/CSCE361ProjectV2