I did some stuff... was awhile ago..
Merge branch 'develop' of https://github.com/vinylthieves/GuysandDawls into develop

Conflicts:
	htdocs/default.html
	htdocs/style.css