resolved conflicts
resolved conflicts
Basic setup complete
chore: setup file framework for creating user.index.erb, users_controller, and spec files for testing of both
current updates
resolved conflicts
Merge branch 'master' into UserDashboard
Merge pull request #13 from bengolden/UserDashboard

User dashboard