stuff
Merge branch 'master' of https://github.com/vishwin/coffeestop
map fixes
Merge branch 'master' of https://github.com/vishwin/coffeestop