Travis will now be running py.test and the first set of tests are out with testing users in django
Removed py.test out of the travis file
Merge branch 'master' of https://github.com/CSc436/gymjournals into 70APIChangeGet
Changed API urls to make more sense
Fixed pep8
Merge pull request #71 from CSc436/70APIChangeGet

70 api change get