Merge pull request #1 from hannes10/develop

Develop
meta lesson
Merge branch 'develop' into staging
meta lesson
merge 1
merge 2
Merge branch 'develop' into staging
merge from local server
Merge branch 'master' of https://github.com/hannes10/bitstarter into develop
push from local infra
Merge branches 'develop' and 'staging' into staging