progress
Revert "progress"

This reverts commit 2ef32cc8461c9c1bdd791ffc4ca8785a58aa18ac.
progress
Progress
Merge branch 'master' of https://github.com/OregonWeed/webdev

Conflicts:
	index.html