commented tests
Merge origin/master

Conflicts:
	src/AmazonStore.java