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

Conflicts:
	src/Main.hs
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Main.hs
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Main.hs
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Main.hs
Merge branch 'master' of github.com:mgsloan/test
ABC
Goo
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Foo.hs
Foo
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Foo.hs
Foo
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Foo.hs
Foo
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Foo.hs
Zapf
Merge branch 'master' of github.com:mgsloan/test

Conflicts:
	src/Foo.hs