Commit my branch
Commiting ALL changes v2
Merge https://github.com/patrickreck/madfolket

Conflicts:
	site.html