Merge branch 'master' of /Users/martalidon/Documents/3_ano/2_semestre/PI/iConfsALM with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.rakeTasks
	.idea/iConfs.iml
	.idea/workspace.xml
	config/routes.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.rakeTasks
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	config/routes.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	config/routes.rb
Seed first administrator
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Memer Create