more slight changes to the homepage and learning orbits
More experimenting with orbits
Changed max_weight field of WeightExercise to allow blank entries
Merge branch '56WeightExerciseTable' of https://github.com/CSc436/gymjournals into 56WeightExerciseTable
Fixed pep8 error
Travis will now be running py.test and the first set of tests are out with testing users in django
Merge branch 'master' into homepage

Conflicts:
	site/app/js/app.js
Merge pull request #65 from CSc436/homepage

Homepage
Merge pull request #64 from CSc436/56WeightExerciseTable

Changed max_weight field of WeightExercise to allow blank entries
Remove Foundation from app.js
Removed py.test out of the travis file
Merge branch 'master' of https://github.com/CSc436/gymjournals into 70APIChangeGet
Merge branch '39DatabaseTests' of https://github.com/CSc436/gymjournals into 39DatabaseTests
Changed API urls to make more sense
Merge pull request #68 from CSc436/67RemoveFoundationFromAppJS

Remove Foundation from app.js
Fixed pep8
Added a table for storing Aerobic Exercises.  The table remembers the exercise name, duration, initial heartrate, and final heartrate
Deleted an extra pytest.ini file and altered the tests so they run in under a second
Merge branch 'master' into 39DatabaseTests
Merge branch 'master' into 69AddAerobicTable