added maps
added locations
Merge branch 'master' of https://github.com/mefuru/hipstertipster