Problem Package.json : bug

bug to pull : inutil push
Merge branch 'master' of https://github.com/malikba/angular-express-gallery

Conflicts:
	package.json
Merge branch 'master' of https://github.com/malikba/angular-express-gallery