.
Merge branch 'master' of https://github.com/toughIQ/1stTry

Conflicts:
	sometext.txt