readme updated
Merge branch 'master' of github.com:bedita/frontend-zenlike

Conflicts:
	README.md