Merge branch 'master' of https://github.com/alrightdesign/Spirito

Conflicts:
	css/lele.css
Merge branch 'master' of https://github.com/alrightdesign/Spirito

Conflicts:
	css/lele.css