Also ignore the Gemfile.lock, since we work on different platforms
Basic bid model.
Added associations, routes.
Auctions routes/controller/views for: new, show, index.
Generated bid controllers.
Updated bids controller.
Auctions edit (views, controller).
Auctions destroy (controller).
Addes some simple validations to auction (view, controller).
Refactoring: Renamed auctions.min_price to auctions.start_price.
Added relation to user for bid.
Max bid is now validated in bid model.
Fixed bidder/user confusion.
Merge branch 'feature/bid' into dev
Removed reference of user in migrate file.
Merge branch 'feature/auction' ( #1 ) into dev

Conflicts:
	app/models/auction.rb
	config/routes.rb
	db/schema.rb
Deleted the welcome route.
Merge branch 'dev' into feature/users

Conflicts:
	config/routes.rb
	db/schema.rb
Solving merge conflicts.