Delete line in about.html
Conflict solved + push to origin
added User class, loginCtrl