implementing logar template, fixin login bar on base.html
fixing merge
interface improvements
fixing files with ~