Modified README.md from tupi.ca
Merge branch 'master' of https://github.com/likhter/test

Conflicts:
	README.md