Initial commit
Init
Merge branch 'master' of github.com:ddedic/ng-starter

Conflicts:
	README.md
.idea & readme
Shops
ng-starter

Finally something I can work with
update
remove .DS_Store
gitignore
Merge branch 'master' of github.com:ddedic/hit6-client

Conflicts:
	README.md