some
Merge branch 'master' of https://github.com/amunra81/projects

Conflicts:
	haskell/www/yesod/basic/templates/client_session_key.aes