text changes, unknown option for lost location
Merge branch 'master' of https://github.com/Musicophilia/hackathon
Merge branch 'master' of https://github.com/Musicophilia/hackathon