Initial commit
Basic project files
Test2
Test
Foo
Foo
Merge branch 'master' of github.com:mgsloan/test
Roof
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Foo.hs