Reverting accidentaly pushed commits
Removed .gitignore
Merge branch 'master' into gh-pages
Fix
Merge branch 'gh-pages'

Conflicts:
	script.js