Merge remote-tracking branch 'upstream/master'

author Stick <nstickney@gmail.com>

Thu, 22 Jun 2017 18:06:30 +0000 (13:06 -0500)

committer Stick <nstickney@gmail.com>

Thu, 22 Jun 2017 18:06:30 +0000 (13:06 -0500)
author Stick <nstickney@gmail.com>
Thu, 22 Jun 2017 18:06:30 +0000 (13:06 -0500)
committer Stick <nstickney@gmail.com>
Thu, 22 Jun 2017 18:06:30 +0000 (13:06 -0500)
diff --cc keyboards/ergodox/keymaps/familiar/README.md
Simple merge
author	Stick <nstickney@gmail.com>
	Thu, 22 Jun 2017 18:06:30 +0000 (13:06 -0500)
committer	Stick <nstickney@gmail.com>
	Thu, 22 Jun 2017 18:06:30 +0000 (13:06 -0500)