no haskell for me, please
@mavenraven's pull request manually merged because of conflicts
Merge branch 'mavenraven-master'
Merge branch 'master' of github.com:mavenraven/hs-web-showdown

Conflicts:
	src/Main.hs
Merge branch 'master' of github.com:katychuang/hs-framework-showdown