one more commit
commit with vi
Merge branch 'master' of https://github.com/tasos-ale/test

Conflicts:
	README.md