Merge branch 'master' of github.com:MattEddy/spreader

Conflicts:
	index.html
Merge branch 'master' of github.com:MattEddy/spreader