Username added to users.
Happy path test for user account passing.
Merge conflict resolved.
Merge master.
Hound edits.
Merge conflict corrected.
Merge conflict corrected.
Users show page controller and route added.
Travis edits.
Travis edits.
Add image to profile photo test.
Merge branch 'master' of https://github.com/manders9/TrinityMarketplace into add-user
Merge conflict corrected.
Merge pull request #17 from manders9/add-user

Add user