Merge pull request #14 from ahardy55/master

Full updated app, with controllers and Json
heroku stuff
added an end
heroku debugging
heroku debugging
heroku debugging
heroku debugging
installed thin gem
testing post request
testing post request
Merge pull request #15 from ahardy55/merge-conflict

Json Stuff
adding css styles
create exercise controller tests
middle of user controller test
added a background image
update schema diagram and xml to reflect latest data decisions
correct typos in migrations (t.references takes singular name)
remade model associations and updated migrations
create user controller tests
complete controller tests