up
Merge branch 'master' of https://github.com/RodolphoPivetta/Piadouro

Conflicts:
	db.sqlite3
	piadouro_website/views.pyc