Crap from a bad commit
Merge branch 'master' of https://github.com/steinbring/Milwaukee-Soup

Conflicts:
	index.html