amazon s3 upload code
Merge branch 'master' of https://github.com/lolotp/first_app

Conflicts:
	db/development.sqlite3

Merge: use the database where first location has clue_file_name equals to
clue.html