Merge pull request #2 from ahardy55/merge-conflict

Merge conflict
Merge pull request #14 from ahardy55/master

Full updated app, with controllers and Json
Merge pull request #15 from ahardy55/merge-conflict

Json Stuff
Merge pull request #16 from ahardy55/exercise-controller-test

create exercise controller tests
Merge pull request #18 from ahardy55/schema

Merging exercise and controller tests
Merge pull request #19 from ahardy55/rspec

Merging tests for exercise controllers and user controllers/remodeling of the database
Merge pull request #20 from ahardy55/rspec

fix show issues on user and workouts spec