ReadMe Test PhpStorm + Eclipse
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
ReadMe Test PhpStorm + Eclipse