commit
Merge branch 'master' of github.com:cmj717/coding

Conflicts:
	index.html