6
Merge branch 'master' of github.com:emmanouilmatsis/test

Conflicts:
	README.md