max commit
second hayush
Merge branch 'master' of https://github.com/maximri/test-repo-2014-08-16 into maximri-master

Conflicts:
	README.md
Merge branch 'maximri-master'