Merge branch 'master' into master

author Valentin Ouvrard <valentin210594@gmail.com>

Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)

committer GitHub <noreply@github.com>

Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)
author Valentin Ouvrard <valentin210594@gmail.com>
Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)
committer GitHub <noreply@github.com>
Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
Simple merge
author	Valentin Ouvrard <valentin210594@gmail.com>
	Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)
committer	GitHub <noreply@github.com>
	Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)