final version 1.0
Merge branch 'master' of https://github.com/kmossco/kmossco.github.io

Conflicts:
	.gitignore