more info
Merge branch 'master' of https://github.com/calmattoso/INF1771