tmp
Merge branch 'master' of https://github.com/MangelMaxime/Shadaen_website

Conflicts:
	Shadaen_website.userprefs
	Shadaen_website/Main.html
	Shadaen_website/Shadaen_website.fsproj
Template style v0.1.1