starter templates
base_template
Merge pull request #5 from zachsergeant/jon-feature

adding stuff
Merge branch 'master' of https://github.com/zachsergeant/studentattendance into Molly-feature

Conflicts:
	attendance/templates/base_template.html
	attendance/templates/registration/logged_out.html
	attendance/templates/registration/login.html
	attendance/templates/registration/password_reset_complete.html
	attendance/templates/registration/password_reset_confirm.html
	attendance/templates/registration/password_reset_done.html
	attendance/templates/registration/password_reset_form.html
	attendance/templates/registration/register.html
	attendance/templates/student.html
	attendance/views.py
Merge pull request #4 from zachsergeant/Molly-feature
templates updated
Merge pull request #6 from zachsergeant/Molly-feature

templates updated
fixed merge conflicts
Merge pull request #8 from zachsergeant/jon-feature

Jon feature
more stuff
added codeship flags
readded codeship flags
added test_settings
added requirements.txt
molly thinks my job sucks
added requirements
adding tests and views
test
deleted endblock
Merge branch 'master' of https://github.com/Mollydiana/studentattendance into jon-feature