File upload and transfer to s3 :D
Merge branch 'master' of https://github.com/CraigDem/amazonhack

Conflicts:
	application/views/main.php