rebase w master

README.md

@@ -41,6 +41,7 @@ place to ask about it might be in [ipfs/apps](https://github.com/ipfs/apps) or
 - [digx](https://www.dgx.io/) - Digix is an asset-tokenisation platform built on Ethereum and IPFS.
 - [dtube](https://d.tube) - Distributed video sharing with steem.it intergrations, using ipfs for backend storage.
 - [Ethlance](http://ethlance.com) - First completely decentralised job market platform built on Ethereum and IPFS. [Source](https://github.com/madvas/ethlance)
+- [Filemap](https://filemap.xyz/) - Upload files to a geographic point and never memorize a link again.
 - [FileNation](https://filenation.io/) - The simplest way to send your files around the world using IPFS.
 - [git-ipfs-rehost](https://github.com/whyrusleeping/git-ipfs-rehost) - A script to rehost your git repos in ipfs.
 - [Global Upload](https://globalupload.io/) - File transportation service for IPFS, upload files to the future of distributed web.

data/apps.yaml

@@ -127,6 +127,10 @@ content:
     url: https://partysha.re
     description: >
       A simple file sharing app.
+  - name: Filemap
+    url: https://filemap.xyz/
+    description: >
+      Upload files to a geographic point and never memorize a link again.
   - name: FileNation
     url: https://filenation.io/
     description: >