trying again
Merge branch 'master' of https://github.com/kipkeston/kipkeston

Conflicts:
	index.html