changed bop to kramer
Merge branch 'master' of https://github.com/mikesafdieh/gitTutorial

Conflicts:
	index.html