daily
Merge branch 'master' of https://github.com/evanlouie/SchoolNotes
merge fix
Merge branch 'master' of https://github.com/evanlouie/SchoolNotes