boh
boh
boh di nuovo
dajene

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

Conflicts:
	wodrs_fe/index.html
	wodrs_fe/js/jq.template.js
Merge branch 'master' of github.com:barbecuesoft/wodrs
boh

Conflicts:
	wodrs_fe/index.html
minor