Frontend dev commit
Merge branch 'master' of github.com:kodeslacker/d2c