added missing .gitignore file and, guard
updated guardfile
fixed merge conflict
updated gemfile to accomodate guard
completed user model test, user controller user tests in process
implement highest bidder badge in auction view page
Merge branch 'meeting_prep' of github.com:kareemgrant/daughterofstore_engine into merge_meeting_prep
highest bidder badge won't show up if user is logged out
Merge pull request #10 from kareemgrant/meeting_prep

highest bidder badge won't show up if user is logged out
Merge branch 'master' of github.com:kareemgrant/daughterofstore_engine
refactoring bid_spec and user auction features spec
users_controller testing complete
added feature test for user login and signup
updated the sessions controller specs, all tests green
fixed error in migration file, updated schema to match current
Merge branch 'master' of https://github.com/kareemgrant/daughterofstore_engine into refactor_specs
"merge master into refactor_specs"
refactor bids controller
refactor bids controller
refactor bid spec
refactor specs