resources
Merge branch 'development' of github.com:trinityXmontoya/project_2 into Nathan
root and user form partial
Updated Models, Boostrap, Additional Corrections
Merge branch 'development' into Nathan
addded bcyrpt gem/ form partial/ beware of change yamal/
add user fbook id as index value"
"
"
add time_limit column
remove category timestamps
add completed_status to auction
add more relationships to user model
fix auction model relationships
bid model relationships
message model relationship
remove schema file
add viewed attribute to bids and auctions
add update auction and message viewed_status to controller
reset config file
update routes using resourceful routes
Merge branch 'development' of github.com:trinityXmontoya/project_2 into user_profiles

Conflicts:
	app/models/user.rb
	config/routes.rb