lots of work has been done.
to much for me to describe.
you will just have to figure it out.
Merge branch 'master' of https://github.com/mharris/newGitTest

Conflicts:
	index.html