shorter names
Merge branch 'master' of https://github.com/krissm/Workshop2.git
sync issue