Edit git settings
Merge branch 'master' of github.com:savakac/ngmakers