added my.conf.js
Merge branch 'master' of github.com:AlexTi/angular-seed