can't register yet
merge conf
merge try
cool it works
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
making it nice
Merge pull request #16 from MiguelABarbosa/jeff

Jeff
final changes before mike works on it