setup
Merge branch 'master' of github.com:GrantStampfli/Gen-O-Matic