facebook user sign out and sign in working
too many views keep blowing up at me
clearing merge conflict
Merge pull request #17 from trinityXmontoya/testing

Tuesday 4/29 clean copy 9:20am resolved merge conflicts
add num_of_winners attribute to auctions table
add auction_participants model and respective relationships on related models
add website and address attribute to auction model
nest bids under auction routes
add calculate_time_left method for auction
add img_url attribute to auctions
4/29 user_profile merge