User scaffolding corrigido
Scaffolded micropost
Linked db tables
Modefied homepage to users index
Before fixing microposts errors
Fixed all micropost errors
Solving commit problems
Solving branch merge conflit 1/2
Merge branch 'master' into HEAD

Conflicts:
	app/models/user.rb
	config/routes.rb
	test/fixtures/users.yml

Tentando fazer merge de branch

:quit
Tentando fazer merge de branches
Trying merging branches