init
Create README.md
initial
Merge remote-tracking branch 'origin/master'
compile scripts
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	index.html