Test commit
Merge branch 'master' of github.com:fransstudio2/mycutelittlethingy_template

Conflicts:
	haml/index.php.haml
	index.php
	sass/style.css.sass
	style.css
Back to normal