added location popup to author answer
hopefully resolves merge
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project