dajene
Merge branch 'master' of https://github.com/barbecuesoft/wodrs

Conflicts:
	wodrs_fe/css/style.css
a bit of style and new vert ads!