ADD line 8
Merge branch 'feature/5'
ADD line 10
Merge branch 'master' of https://github.com/davidcordon/CG
Merge branch 'feature/6'