Revert "commit #1"

This reverts commit 6daf49f74e0e265426d2befa5031a5f490df78bc.
Merge branch 'master' of https://github.com/mbrussell/matthew

Conflicts:
	.gitignore