Hopefully fix database issue
Merge branch 'master' of https://github.com/madisonmay13/Take5-Server