Comments, styling of login page
resolved merge conflict in main.js