now test merge stuff
Merge branch 'new_branch_for_2.3' of github.com:aarondaniel/grav-merge into new_branch_for_2.3

Conflicts:
	src/Main.hs
commit post merging