suite template
Merge branch 'master' of https://github.com/fhacktory/46cl

Conflicts:
	.DS_Store
	site/index.html
	site/style.css