add more stuff to the test.txt from original repo
Merge branch 'master' of github.com:williamlibrata/amazon-cloud

Conflicts:
	test.txt
remove all git default merge messages
add featurea.txt for featurea
Merge branch 'featureacopy' of github.com:williamlibrata/amazon-cloud into featurea

Conflicts:
	featurea.txt