Commit final
Merge branch 'master' of https://github.com/dhcarmona/scrum-management-system

Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/show_team.html.erb
	app/views/users/add_to_team.html.erb
	config/routes.rb
	db/schema.rb