Added models for person and check-in
Merge pull request #1 from zachsergeant/feature-zach

Added models for person and check-in
yay?
adding attendance
Merge branch 'master' into jon-feature

Conflicts:
	.gitignore
	attendance/views.py
	studentattendance/settings.py
	studentattendance/urls.py
Merge pull request #2 from zachsergeant/jon-feature

Jon feature
adding stuff
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