added current city, state
Merge branch 'master' of https://github.com/sunheng/HackGT2014