First commit
Add line
Change line
Fix merge conflict
Merge branch 'master' of github.com:cherimarie/gdi-workshop-test