style
Merge branch 'master' of https://github.com/summatusmentis/site

Conflicts:
	content/stylesheet.css
newer version
remove some files
updating to newest version