adding urls and fixing login stuff
Merge pull request #15 from MiguelABarbosa/miguel

adding urls and fixing login stuff
merge conflict
Merge branch 'master' of https://github.com/MiguelABarbosa/class_attendance into jeff