updated from live copy
Merge branch 'min' of https://github.com/studiotwelve/Hurley-s-New into min

Conflicts:
	index.html