Git basics
Merge branch 'master' of https://github.com/zortok/INF4705