added contact options
safety
safety
aftey
erge branch 'dev'

Conflicts:
	_site/assets/js/main-ck.js
	_site/index.html
	assets/js/main-ck.js
	codekit-config.json
	index.html
clean up