Added current location marker
Added current location
Commit after merge
Merge pull request #3 from jwinskill/locationbranch

Locationbranch