Fixed current location marker
Merge branch 'master' of github.com:vmathur/mhacks3