first commit
Merge branch 'master' of github.com:zachsergeant/studentattendance
Merge branch 'master' into jon-feature

Conflicts:
	.gitignore
	attendance/views.py
	studentattendance/settings.py
	studentattendance/urls.py