my initial setup
Merge github.com:nirgit/ngshop