Update readme
Merge branch 'master' of https://github.com/Edicy/design-boilerplate

Conflicts:
	README.md