Committing the weirdness
Merge branch 'master' of https://github.com/codeharbour/fixie-html

Conflicts:
	styles/main.css
Remove whitespace