darren's second edits and now commits
resolve
Merge branch 'master' of https://github.com/atehwa/git-koulutus
new file on branch
some more comments
some new commits on master
Merge branch 'local2 yes please add'
resolve
Merge branch 'master' of https://github.com/atehwa/git-koulutus
Merge branch 'master' of https://github.com/atehwa/git-koulutus