Initial commit
Merge branch 'master' of https://github.com/rizafahmi/shop-app

Update gitignore

Conflicts:
	.gitignore