added gh-pages
added gh-pages
swapped header/footer
adding DS_store
merging with gh-pages