add dev-env
Merge branch 'master' of github.com:jhotta/project-x