fixed conlficts of commit
trying to fix the comminting conflicts
again trying to fix the commit
Merge branch 'master' of https://github.com/walidvb/lezoo

Conflicts:
	sites/all/themes/lezoo/css/style.css