commit for merge test
Merge branch 'master' of github.com:aarondaniel/grav-merge

Conflicts:
	src/Test/Main.hs
Merge branch 'master' of github.com:aarondaniel/grav-merge