Merge pull request #1 from zgolman/samantha

Samantha
basic FB links
Facebook deploying on heroku
Add postgres compatibility to .travis.yml
travis.yml installed and auto-deploy
testing travis
auction model completed
schema work
started the timer
timer done
just added products models
Merge pull request #2 from zgolman/samantha

Samantha
fixed merge conflicts
Merge pull request #3 from zgolman/backend

Backend
Merge pull request #4 from zgolman/master

Merge with Master