'init'
Merge branch 'master' of https://github.com/kovaleff/presta1.6

Conflicts:
	README.md