Initial commit
Merge https://github.com/busligisti/Assignment1