Just `rails new`
Merge branch 'master' of github.com:abelmartin/fair-fare-share

Fixed gitignore Conflicts:
Added a users table and needed gems.