scripts at the end
Merge branch 'master' into entrypoint

Conflicts:
	index.html
js!
js at the end
remove
Merge branch 'master' into entrypoint
Merge pull request #9 from portmanteau/entrypoint

js at the end