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

Conflicts:
index.html
Merge branch 'master' of https://github.com/JoeRaetano/mysite