From EC2
Merge branch 'master' of https://github.com/gregtheyoung/GitExtTestXX

Conflicts:
	Added file.txt