working on controllers to show posts by user
Merge branch 'master' of https://github.com/mvdiener/p3_5day

Conflicts:
	app/controllers/users_controller.rb
working on fleet view
Merge branch 'master' of https://github.com/mvdiener/p3_5day
finishing box
Merge branch 'master' of https://github.com/mvdiener/p3_5day
got link paths working on user controller