banner
spelling
Merge branch 'master' of https://github.com/daviti/socos

Conflicts:
	index.html