Changed ishes
Added ishes

The ishes were requested by the client
Added index2.html

Needed to add the new index2.html page
Deleted index2.html

We didn't need the file any mo.
Merge conflict 1
Replace master branch with page content via GitHub
First push to github pages
Posting John's site
Final commit for project
Final push, trying again
Merge branch 'master' into gh-pages