First commit
Merge branch 'master' of github.com:ssnsestak/gdi-workshop-test