Merge branch 'jon' of github.com:davidhn/happyhour
Merge branch 'master' of github.com:davidhn/happyhour
facebook login maybe done
finished facebook login
CRUD'ed restaurants
Merge branch 'jon' of github.com:davidhn/happyhour