footer
Merge branch 'sophie' of https://github.com/bkwalker/pocketChange into newsfeed
users show page working
Merge pull request #20 from sdford/populate

I've tested this. I'm going to go ahead and merge it
updated models and tests
fixed tests
Merge pull request #22 from sdford/modelUpdates

Model updates
merge with grid branch
Merge branch 'master' of https://github.com/sdford/pocketChange into sophie
fixed the grid and header
permanent fix for grid
fixed the navigation routes and user form
Merge pull request #23 from bkwalker/item_view

Fixed the navigation routes for profile and reformatted the user edit form.