added models
routes
merge conflicts STOP
finished oauth, added friends models
finish models
Merge pull request #1 from agadiraju/crushes

Crushes