updated post
Merge branch 'master' of github.com:cimar/cimar.github.com

Conflicts:
	index.html