Pizarra de cambio casi lista
Merge branch 'master' of heroku.com:pizarraebs

Conflicts:
	app/views/devise/registrations/edit.html.erb
	app/views/entries/index.html.slim
Actualizacion automatica de la pizarra