s3 problems
Merge branch 'master' of github.com:schematical/shiporgetoffthepot

Conflicts:
	README.md