roba
fix stuff
Merge branch 'master' of github.com:comick/barduino

Conflicts:
	app/views/parties.html
	app/views/tubi.html
stica