first
Merge branch 'master' of
https://github.com/jrile/ec2instancelauncher.git

Conflicts:
	.gitignore
	README.md