Merge branch '39DatabaseTests' of https://github.com/CSc436/gymjournals into 39DatabaseTests
Deleted an extra pytest.ini file and altered the tests so they run in under a second
Merge branch 'master' into 39DatabaseTests
Merge branch '39DatabaseTests' of https://github.com/CSc436/gymjournals into 39DatabaseTests
pytest start in the inner gymjournals directory
Merge branch '39DatabaseTests' of https://github.com/CSc436/gymjournals into 39DatabaseTests
Users now just have to run reset_db.sh for test privilages
Merge branch 'master' into 39DatabaseTests