Username added to users.
Happy path test for user account passing.
Merge branch 'master' of https://github.com/manders9/TrinityMarketplace into add-foundation
Merge branch 'master' of https://github.com/manders9/TrinityMarketplace into add-foundation
Merge conflict resolved.
Heroku config.
Ruby added.
Carrierwave initializer edited.
Carrierwave initializer edited.
Travis file edited.
End added.
Assets.
Devise.rb removed from gitignore.
Merge branch 'master' of https://github.com/manders9/TrinityMarketplace into add-foundation
Sign up form requirements added.
Created users profile page.
Merge master.
Hound edits.
Merge conflict corrected.
Merge conflict corrected.