other change
create users
Merge branch 'master' of https://github.com/giibran/agenda_mvc

Conflicts:
	controller/agenda.rb
se arreglo