Merge pull request #32 from ilanasufrin/emily

fixes merge conflicts, restores user show page
Show page fixes
Fixes merge conflicts
adds user edit page to set location
Fixes session user persistence
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
trying to get edit params working
Merge pull request #33 from ilanasufrin/ben_branch

Ben branch
Fixes user persistence (again) in show page
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Merge pull request #35 from ilanasufrin/ben_branch

Fixes user persistence (again) in show page
in the middle of merge conflicts
fixing merge conflicts
Gets to the friends page with friends on first load, but doesn't persist from page to page
Merge pull request #36 from ilanasufrin/ben_branch

Ben branch
Fixes merge conflicts
Merge pull request #37 from ilanasufrin/ben_branch

Fixes merge conflicts
Persists friend objects in db and user show page
Merge pull request #38 from ilanasufrin/ben_branch

Persists friend objects in db and user show page
shouldn't modify anything, trying to find cursor to get next page of friends