First pages commit
updates javascript
Merge branch 'gh-pages'

Conflicts:
	js/main.js
updates js