first (test) commit
another test commit
Merge branch 'master' of https://github.com/calvinrs/scala-course