Merge pull request #2 from alex-filat/master

get merge result
add 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md