Adding pages
Adding pages
Added index.html
Merge branch 'gh-pages'

Conflicts:
	favicon.ico
	footer.php
	header.php
	index.html