added oj and unique_generator gems:
added versioning
added tests for username
added tests for sessions_controller_spec.rb, one test failing
adding migrations and a few other untracked files
Set default host for postgres
Merge branch 'merchant_sign_in' of github.com:Team-Moar/Moar-Rails into merchant_sign_in
Removed buggy migrations
current gemfile.lock
adding app/controllers/api/, app/views/api/, spec/controllers/
adding Gemfile.lock
merging local branch with remote
fixed merchant model
modified generate_auth_token
deleted commented-out code
added Pry to the project
tests pass for sessions_controller_spec
removed extra application_controller
Merge pull request #6 from Team-Moar/merchant_sign_in

Merchant sign in