Commiting!!!
zMerge branch 'master' of github.com:androdri/repos

Conflicts:
	otherFile.txt