some stuff
Merge branch 'master' of github.com:CultureOffset/cultureoffset.github.com

Conflicts:
	index.md