experiemnting
Merge branch 'master' of https://github.com/b2w/myDay

Conflicts:
	templates/default/item.html