Merge branch 'attendance' into dev
Merge branch 'dev' of https://github.com/attendanceproject/djattendance into dev
Merge branch 'dev' of https://github.com/attendanceproject/djattendance into dev
ignore local settings file
Merge branch 'dev' of https://github.com/attendanceproject/djattendance into dev