preparation for more variations
Merge branch 'master' of github.com:Try2Code/andAllTheRestOfIt