basic config
Merge branch 'master' of https://github.com/tobikris/tobiworlds-app