Creating template
Merge branch 'master' of ssh://tapir-jonathans.rhcloud.com/~/git/tapir

Conflicts:
	README.md
	server.js
trying a simple request to S3