Dirty inital
Push to github
Merge branch 'master' of github.com:/gambo/conductor