init
ready for prod
Merge branch 'master' of https://github.com/Kazanovitz/conrad