Merge branch 'master' into patch-1

README.md

@@ -28,6 +28,7 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el
 
 ## Apps
 
+- [3Box](https://3box.io) - Create and manage your Ethereum Profile, and your personal data. Use the 3box-js library to integrate profiles into your dapp. [Source](https://github.com/uport-project/3box)
 - [a js video player](https://github.com/ipfs/website/tree/master/content/docs/examples/webapps/play) - [Demo](https://ipfs.io/ipfs/QmVc6zuAneKJzicnJpfrqCH9gSy6bz54JhcypfJYhGUFQu/play#/ipfs/QmTKZgRNwDNZwHtJSjCp6r5FYefzpULfy37JvMt9DwvXs)
 - [a markdown renderer](https://github.com/ipfs/website/tree/master/content/docs/examples/webapps/markdown-viewer) - [Demo](https://ipfs.io/ipfs/QmSrCRJmzE4zE1nAfWPbzVfanKQNBhp7ZWmMnEdbiLvYNh/mdown#/ipfs/QmfQ75DjAxYzxMP2hdm6o4wFwZS5t7uorEZ2pX9AKXEg2u)
 - [a qr-code renderer](https://github.com/ipfs/website/tree/master/content/docs/examples/webapps/qr-render) - [Demo](https://ipfs.io/ipfs/QmccqhJg5wm5kNjAP4k4HrYxoqaXUGNuotDUqfvYBx8jrR/qr#enter%20text%20here)
@@ -45,7 +46,6 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el
 - [dtube](https://d.tube) - Distributed video sharing with steem.it intergrations, using ipfs for backend storage.
 - [enzypt.io](https://enzypt.io/) - A website to buy and sell files through Ethereum and IPFS. [Source](https://github.com/flex-dapps/enzypt)
 - [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.
@@ -80,10 +80,12 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el
 - [Peer Bandwidth Demo](https://ipfs.io/ipfs/QmVaVXbLdw4R5NqAiiQoTWtitxo5g7FS31PQmCLbH9p8Fu/) - An demo app that uses window.ipfs, provided by the IPFS Companion web extension to get and graph bandwidth info for your IPFS node [Source](https://github.com/tableflip/ipfs-peer-bw-example)
 - [Peer Map Demo](https://ipfs.io/ipfs/QmRPGCmLKH2dQmNiPRsiuYS9EhhJL1Gmkz5F75gKY1K4Bm/) - A map of IPv4 IPFS peers that uses window.ipfs [Source](https://github.com/tableflip/ipfs-peer-map-example)
 - [Philes](https://philes.co) - A simple browser-based IPFS notepad app. [Source](https://github.com/chrismatthieu/philes)
+- [Pinata](https://pinata.cloud) - Build and manage your dapp through Pinata’s REST API and IPFS toolkit.
 - [Playback](https://mafintosh.github.io/playback/) - IPFS playback support. This allows casting a video in IPFS to a Chromecast.
 - [PubSub Chat Demo](https://ipfs.io/ipfs/QmWZ3u5S7RjFXKfW6dSZhj7CozcvpqJxm48RYMmKkWcmNQ/) - A ~76KB demo chat app that uses window.ipfs, provided by the IPFS Companion web extension [Source](https://github.com/tableflip/ipfs-pubsub-chat-example)
 - [PushToTalk](http://timothy.hobbs.cz/push-to-talk/index.html) - Push to Talk lets you edit audio essays and publish them with IPFS.
 - [qri](https://qri.io) - Dataset creation, collaboration, and discovery on the distributed web. [Source](https://github.com/qri-io/qri)
+- [TallyLab](https://tallylab.com/) - Local-first, end-to-end encrypted diary app for capturing, analyzing, and sharing data about any and everything.
 - [Temporal](https://github.com/RTradeLtd/Temporal) - Temporal is an easy to use API and platform for integrating IPFS and other distributed/decentralized storage technologies into enterprise applications
 - [Textile Photos](https://www.textile.photos) - Textile Photos is a secure, mobile digital wallet for your photos. [Source](https://github.com/textileio/textile-mobile)
 - [ToDo List Demo](https://ipfs.io/ipfs/QmfFaH6dGibQ5JwEdsujeHBzsmHUsFRB5kU9P8nzPyzMv2/) - A ToDo List demo app that uses windows.ipfs. [Source](https://github.com/ipfs-shipyard/demo-ipfs-todo)
@@ -151,10 +153,11 @@ Everyone is welcome to submit their new awesome-ipfs item. In order to add an el
 
 ## Videos
 
+- [Distributed Apps with IPFS - Juan Benet at Fullstack Fest 2016](https://www.youtube.com/watch?v=jONZtXMu03w) - This talk breaks down how to build a dynamic app on top of IPFS with CRDTs, pub/sub, and slick UIs. It also delves into new models for distributed computation, and the ethical importance of distributing the web.
 - [IPFS Alpha - Why we must redistribute the web](https://www.youtube.com/watch?v=skMTdSEaCtA) 
-- [IPFS Simply Explained](https://www.youtube.com/watch?v=5Uj6uR3fp-U) 
-- [Juan Benet at Fullstack Fest 2016](https://www.youtube.com/watch?v=jONZtXMu03w) 
-- [Juan Benet at Stanford 2015](https://www.youtube.com/watch?v=HUVmypx9HGI) 
+- [IPFS Simply Explained](https://www.youtube.com/watch?v=5Uj6uR3fp-U) - Let's take a look at how IPFS works, how it can solve issue's like censorship and if it would really work across multiple planets!
+- [Juan Benet at Stanford 2015](https://www.youtube.com/watch?v=HUVmypx9HGI) - The talk includes a broad look at The IPFS Project, and a discussion on evolving the network stack through open source protocols R & D.
+- [Textile Build Series - A Free Online Workshop](https://www.youtube.com/playlist?list=PLC8CEtJ9shDznO1tpvGe--BVEWmCKY9_Z) - A full Training Program to teach devs on how to build for the Decentralized Web. The series covers a ton of content, touch multiple parts of the IPFS stack and guides devs through building a simple DApp.
 
 ## Discussions
 

data/apps.yaml

@@ -145,10 +145,6 @@ content:
     website: https://partysha.re
     description: >
       A simple file sharing app.
-  - title: Filemap
-    website: https://filemap.xyz/
-    description: >
-      Upload files to a geographic point and never memorize a link again.
   - title: FileNation
     website: https://filenation.io/
     description: >
@@ -212,6 +208,11 @@ content:
     website: https://arpadyne.computes.com
     description: >
       The New Internet - DNS powered by OrbitDB. Content delivered via IPFS.
+  - title: TallyLab
+    website: https://tallylab.com/
+    picture: /images/tallylab.jpg
+    description: >
+      Local-first, end-to-end encrypted diary app for capturing, analyzing, and sharing data about any and everything.
   - title: Temporal
     source: https://github.com/RTradeLtd/Temporal
     description: >
@@ -259,6 +260,11 @@ content:
     picture: /images/peer-bandwidth-demo.jpg
     description: >
       An demo app that uses window.ipfs, provided by the IPFS Companion web extension to get and graph bandwidth info for your IPFS node
+  - title: Pinata
+    website: https://pinata.cloud
+    picture: /images/pinata.png
+    description: >
+      Build and manage your dapp through Pinata’s REST API and IPFS toolkit.
   - title: PubSub Chat Demo
     website: https://ipfs.io/ipfs/QmWZ3u5S7RjFXKfW6dSZhj7CozcvpqJxm48RYMmKkWcmNQ/
     source: https://github.com/tableflip/ipfs-pubsub-chat-example
@@ -296,3 +302,10 @@ content:
     description: >
        A Decentralised Cloud Storage Platform. know more here
        http://clusterlabs.io/#projects
+  - title: 3Box
+    website: https://3box.io
+    source: https://github.com/uport-project/3box
+    picture: /images/3box.png
+    description: >
+      Create and manage your Ethereum Profile, and your personal data. Use the 3box-js
+      library to integrate profiles into your dapp.

data/videos.yaml

@@ -9,9 +9,26 @@ content:
   - title: IPFS Simply Explained
     website: https://www.youtube.com/watch?v=5Uj6uR3fp-U
     picture: /images/ipfs_simply_explained_video.jpg
+    description: >
+      Let's take a look at how IPFS works, how it can solve issue's like
+      censorship and if it would really work across multiple planets!
   - title: Juan Benet at Stanford 2015
     website: https://www.youtube.com/watch?v=HUVmypx9HGI
     picture: /images/stanford-2015.jpg
-  - title: Juan Benet at Fullstack Fest 2016
+    description: >
+       The talk includes a broad look at The IPFS Project, and a discussion on evolving the network stack through open source protocols R & D.
+  - title: Distributed Apps with IPFS - Juan Benet at Fullstack Fest 2016
     website: https://www.youtube.com/watch?v=jONZtXMu03w
     picture: /images/fullstack-fest-2016.jpg
+    description: >
+      This talk breaks down how to build a dynamic app on top of IPFS with
+      CRDTs, pub/sub, and slick UIs. It also delves into new models for
+      distributed computation, and the ethical importance of distributing the
+      web.
+  - title: Textile Build Series - A Free Online Workshop
+    website: https://www.youtube.com/playlist?list=PLC8CEtJ9shDznO1tpvGe--BVEWmCKY9_Z
+    picture: /images/textile-build-series.jpg
+    description: >
+      A full Training Program to teach devs on how to build for the
+      Decentralized Web. The series covers a ton of content, touch multiple
+      parts of the IPFS stack and guides devs through building a simple DApp.