botones
Merge branch 'master' of https://github.com/amorenoma/Calendario

Conflicts:
	app/assets/stylesheets/application.css~
	app/views/meses/ver_dia.html.haml