Merge branch 'map'
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 19 Nov 2015 09:13:45 +0000 (10:13 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 19 Nov 2015 09:13:45 +0000 (10:13 +0100)
* map:
  Added "this is you" marker
  Added "this is you" marker
  Added "this is you" marker


Trivial merge