bug gixes
Merge branch 'master' of https://github.com/marco135/135design.com

Conflicts:
	css/style.css
	css/style.min.css
	index.html