Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
no significant changes. just messing around
Merge pull request #30 from ilanasufrin/ben_branch

Ben branch
merge conflicts
still fixing merge conflicts
Fix show page conflict, displays friends on show page