pulled from upstream
Merge branch 'master' of github.com:fijimunkii/hintr
Merge pull request #2 from Fprince333/master

added cookie false to js file
proper comment
Merge branch 'master' of github.com:fijimunkii/hintr
fixed coffee script for the login
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