Merge pull request #250 from dubek/skew

author Joel Martin <github@martintribe.org>

Mon, 21 Nov 2016 17:16:23 +0000 (11:16 -0600)

committer GitHub <noreply@github.com>

Mon, 21 Nov 2016 17:16:23 +0000 (11:16 -0600)
author Joel Martin <github@martintribe.org>
Mon, 21 Nov 2016 17:16:23 +0000 (11:16 -0600)
committer GitHub <noreply@github.com>
Mon, 21 Nov 2016 17:16:23 +0000 (11:16 -0600)
diff --cc .gitignore
Simple merge
diff --cc .travis.yml
Simple merge
diff --cc Makefile
Simple merge
diff --cc README.md
Simple merge
author	Joel Martin <github@martintribe.org>
	Mon, 21 Nov 2016 17:16:23 +0000 (11:16 -0600)
committer	GitHub <noreply@github.com>
	Mon, 21 Nov 2016 17:16:23 +0000 (11:16 -0600)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README.md	patch \|	diff1 \|	diff2 \|	blob \| history