Added user account page with listed flits
Merge pull request #15 from mvdiener/user_fleet

Added user account page with listed flits
working on controllers to show posts by user
Merge branch 'master' of https://github.com/mvdiener/p3_5day

Conflicts:
	app/controllers/users_controller.rb
Slight update to user show logic
Merge pull request #16 from mvdiener/user_fleet

Slight update to user show logic
working on fleet view
Merge branch 'master' of https://github.com/mvdiener/p3_5day
Add flight view and show controller
Merge pull request #17 from mvdiener/flights-controller

Add flight view and show controller
finishing box
Merge branch 'master' of https://github.com/mvdiener/p3_5day
got link paths working on user controller
Fix merge conflicts