updating pages
Merge branch 'gh-pages'

Conflicts:
	.DS_Store