Merge remote-tracking branch 'upstream/master'

author Jonathan Campbell <jonathan@castus.tv>

Thu, 21 Apr 2016 14:27:33 +0000 (07:27 -0700)

committer Jonathan Campbell <jonathan@castus.tv>

Thu, 21 Apr 2016 14:27:33 +0000 (07:27 -0700)
author Jonathan Campbell <jonathan@castus.tv>
Thu, 21 Apr 2016 14:27:33 +0000 (07:27 -0700)
committer Jonathan Campbell <jonathan@castus.tv>
Thu, 21 Apr 2016 14:27:33 +0000 (07:27 -0700)
diff --cc .gitignore
Simple merge
diff --cc makefile
Simple merge
author	Jonathan Campbell <jonathan@castus.tv>
	Thu, 21 Apr 2016 14:27:33 +0000 (07:27 -0700)
committer	Jonathan Campbell <jonathan@castus.tv>
	Thu, 21 Apr 2016 14:27:33 +0000 (07:27 -0700)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
makefile	patch \|	diff1 \|	diff2 \|	blob \| history