UI addition of vertical alignment for login screen
Merge branch 'master' of https://github.com/madisonmay13/Take5-Server
Fix merge conflict in layout.jade