added moose that works so so
Merge branch 'master' of https://github.com/jonalonn/sexinsweden

Conflicts:
	css/main.css
	views/fantasy.html