first commit
Merge github.com:underscore05/parents-and-teachers