Initial commit
Merge https://github.com/ffurjanic/School_Work