re-re-resync
Merge branches 'master' and 'master' of github.com:nnikzat/Startup-class