login page complete
resolved header conflicts
Merge branch 'jlbernard-master'
merging in nav bar, with login page/base.html