Merge pull request #4 from ilanasufrin/ilana

deletes keynote folder
Merge pull request #5 from ilanasufrin/ilana

Ilana
Updates model diagram with friendships join table
Removes silly keynote files, jeez keynote is annoying
Merge pull request #6 from ilanasufrin/ben_branch

Ben branch
Merge pull request #7 from ilanasufrin/ilana

adds figaro
Adds seed data for testing
Merge pull request #8 from ilanasufrin/ilana

modified gitignore for collaboration
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Rolls back to previous commit to undo the borked rspec installation, adds seed data back
Rolls back to previous commit to undo the borked rspec installation, adds seed data back
Sets up rspec with initial model tests
Merge branch 'ben_branch' into HEAD
Merge pull request #9 from ilanasufrin/ben_branch

Ben branch
merge conflicts