auction creation
Merge branch 'development' of github.com:trinityXmontoya/project_2 into development
user show page
clearing second merge conflict