Converted to FP Complete Haskell Center
Commit some changes
Merge branch 'master' of github.com:yesodweb/yesodweb.com
Updated project-settings file
Merge branch 'master' of github.com:yesodweb/yesodweb.com

Conflicts:
	.project-settings.yml
	Settings.hs