solve some conflicts
fixed code style
Merge pull request #11 from New-York-Falcons/win-restore

solve some conflicts
Updated schema
Updated login link
simplified user messages for auctions
more information for user on how to auto bid
* fixed ugly looking "place bid" button
refactored auctions controller
users are able to overbid (update their existing bid)
more refactoring fixed end date not in past hook
not using hook but validation
fixed bug on pacing bids, added end date to auction show page
refactored extend bid time by 15 min hook
code beautification
Added Emailaddress to Navbar
auto bidding for one auto bidder is working
* still to test for more than one
Added cancan

+ Only onwer of the auciton can edit them
+ Owner can not bid on own auction
Added Owner Info to Show page
Merge pull request #13 from New-York-Falcons/user-name

Added Owner Info to Show page
fixed bug for one auto bidder, auto bidding for two or more