Added some tests
Merge branch 'master' of https://github.com/CSc436/gymjournals
Tests have been fixed and test the newly added fields
ALmost done with the user changes to the tests
SHould pass pep8, but now more tests have to be written for user...
Merge branch 'master' into 86FixTests
Testing out travis things
Saving travis
Merge branch 'master' into 86FixTests
Testing travis
See if travis runs pytest
Exported settings so py.test should be able to run
Had to place export on the same line as py.test
Had to change the settings
python version was accidently changed. Reverted back to old version
Another change to Travis
Changed the age property of SiteUser to return a more accurate age for the user.  Added tests to test_user.py to test all the unique fields in the database as well as the current_weight of SiteUser and the SiteUser's age in the case where today is their birthday and then their birthday is changed to be one day later.  Their age should decrease by 1 which it now does.
Added some psql things to travis, which may help pytest run
Made test_user.py pass pep8
Reverted the psql changes