First pages commit
Bug fixed
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	js/main-page.js