changed file name
Merge remote-tracking branch 'refs/remotes/origin/gh-pages'

Conflicts:
	.DS_Store