add controller shells (and specs) for exercise/workout histories; add controller shells for exercise and workout
revise associations
create exercise controller
create workout controller
create workout_history controller
create exercise history controller
add error handling to controllers
model tests complete
partial controller test complete
add api url to routes
created test_api route with json data
move json to test_api_call method
resolve merge conflicts in seed data
Merge pull request #2 from ahardy55/merge-conflict

Merge conflict
Merge pull request #14 from ahardy55/master

Full updated app, with controllers and Json