changed h2 font-size
deleted unused code
merge conflic in main.js resolved
merge conflic in default.css resolved
changed text format for error message