departamentos
Merge branch 'master' of github.com:epreto/jk_project

Conflicts:
	app/views/meetings/index.html.erb