Adding the correct index page to the gh-pages branch
Add .DS_Store file
Conflict fixed
Deleted CSS from index page, added head, title, and link tags...

deleted some useless commented out html