synchronizing local to github
Merge branch 'master' of https://github.com/JoeRaetano/mysite

Conflicts:
	index.html