1
Merge branch 'master' of https://github.com/freebo/awssnap

Conflicts:
	new.py