this is from copy
Merge branch 'master' of github.com:williamlibrata/amazon-cloud

Conflicts:
	test.txt