sdfsd
Merge branch 'master' of https://github.com/nirmal-apprika/test

Conflicts:
	1.txt
con solve