user story #2 complete
fixed merge conflict
facebook method for user model
preliminary scrape
hints table
likes table
matches table
pictures table
add profile picture column to hints
table relationships + 60day auth token
user scrape_facebook method still needs work
entity relationship diagram
scrape_facebook panning out
users uid to bigint
Merge pull request #4 from DeProdigy/master

added logo and favicon
facebook IDs to strings
Merge branch 'master' of github.com:fijimunkii/hintr

Merging favicon
committing before pull
solved merge conflict
fixed up conflicts