update 2
Merge branch 'master' of github.com:koolook/test1

Conflicts:
	src/Main.hs