Preparing to merge
Merge branch 'master' of https://github.com/madisonmay13/Take5-Server
Fix semicolon
Merge branch 'master' of https://github.com/madisonmay13/Take5-Server
Merge branch 'master' of https://github.com/madisonmay13/Take5-Server
Minor UI changes