naming changes
Merge branch 'master' of https://github.com/beaucharman/html-project-kickstarter

Conflicts:
	index.html