Initial commit
Merge branch 'master' of github.com:mwm/scratchpad

Conflicts:
	.project-settings.yml
	src/Main.hs

All fixed now