updates
Merge branch 'master' of https://github.com/rayleeriver/newGitTest

Conflicts:
	index.html
made this commit
blah blahb bla