moved master, created start file to have master and the django server run on different processes
Merge branch 'master' of https://github.com/eddies5/morpheus-web