generates Rails structure
fix merge conflict with readme
Merge pull request #2 from ilanasufrin/ilana

Ilana
Merge pull request #3 from ilanasufrin/ben_branch

Adds models diagram (jpg and keynote files)
deletes keynote folder
Merge pull request #4 from ilanasufrin/ilana

deletes keynote folder
Updates model diagram with friendships join table
Removes silly keynote files, jeez keynote is annoying