add ami info
add ami info
Merge branch 'master' into update/AMI

Conflicts:
	amazon/start-up-an-ec2-instance.txt
	index.txt
...
update AMI