Added a 2nd file and editied 1st file
Merge branch 'master' of https://github.com/droneale/git-hub-trial

Conflicts:
	aTextFile.txt