andy
Merge branch 'master' of https://github.com/gusar/test

Conflicts:
	newfile