edition

margin, padding, font, position fixed; logo testing added
Merge branch 'master' of https://github.com/DevelopersGuild/dgwebsite

Conflicts:
	public/index.html