E1.1 finish
Merge branch 'master' of https://github.com/MiroK/INF5650.git