Merge branch 'master' into patch-1

author Shel R <Yiskah.Raphen@gmail.com>

Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)

committer GitHub <noreply@github.com>

Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)
author Shel R <Yiskah.Raphen@gmail.com>
Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)
committer GitHub <noreply@github.com>
Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)
diff --cc docs/Using-Mastodon/List-of-Mastodon-instances.md
Simple merge
author	Shel R <Yiskah.Raphen@gmail.com>
	Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)
committer	GitHub <noreply@github.com>
	Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)