adding deploy configuration
adding aws documentation
adding public/uploads to .gitignore
Merge branch 'master' of https://github.com/bahartmann/trampolim into production

Conflicts:
	.gitignore
	Gemfile