Merge branch 'master' of github.com:vaddimart/vaddimart

Conflicts:
	README.md
Merge branch 'master' of github.com:vaddimart/vaddimart