Update base.html
Update base.css
Update base.html
Update base.css
Update base.css
Update base.css
Update base.html
added email to login and made login unique through various error messages
updated reset messages
minor bug fix
merged master, resolved conflict