first commit
Merge https://github.com/Riogan/Schoolwork