Copy changes in the manifest
Remove scaffolding
Merge branch 'master' into ms/progress

Conflicts:
	html/main.html
Also, I deleted a bunch of crap
Merge pull request #1 from mattysads/ms/progress

Ms/progress