asdasd:
Merge branches 'master', 'master' and 'master' of https://github.com/johnerichumphries/remoteClassGit

Conflicts:
	secondRemoteFile.txt