Test
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Main.hs