fixed margin-fix and footer
fixed conflicts in css

Conflicts:
	css/vergel.css