add css changes
Merge branch 'master' of https://github.com/oaguillon/Halltec

Conflicts:
	css/style.css