footer
Merge branch 'sophie' of https://github.com/bkwalker/pocketChange into newsfeed
finished the item form, item view, and header/footer
users show page working
merged grid and item changes
Merge branch 'updatePop' into layout
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.
Merge pull request #21 from sdford/mergedGrid

Merged grid