Updating readme
Merge branch 'master' of https://github.com/shojib/shojib-angular-seed

Conflicts:
	README.md