Merge pull request #477 from Smilliam/master

author Jack Humbert <jack.humb@gmail.com>

Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)

committer GitHub <noreply@github.com>

Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)
author Jack Humbert <jack.humb@gmail.com>
Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)
committer GitHub <noreply@github.com>
Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)
diff --cc quantum/quantum.c
Simple merge
diff --cc readme.md
Simple merge
author	Jack Humbert <jack.humb@gmail.com>
	Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)
committer	GitHub <noreply@github.com>
	Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)
		1	2
quantum/quantum.c	patch \|	diff1 \|	diff2 \|	blob \| history
readme.md	patch \|	diff1 \|	diff2 \|	blob \| history