Initial commit
Ajout de Sass
Merge branch 'master' of github.com:walar/website_template

Conflicts:
	css/main.css
	index.html
	js/main.js