merge conf
merge try
cool it works
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
Merge pull request #17 from MiguelABarbosa/miguel

final changes before mike works on it
Merge branch 'master' of github.com:MiguelABarbosa/class_attendance into mike

Conflicts:
	class_attendance/urls.py
	scheduler/templates/index.html
Created the signin logic, has not been formatted.