add image uploading to s3
Add dummy env variables for travis
Add dummy env variables for travis
Merge branch 'addimages' of github.com:Thesoro/Personal_Portfolio into addimages

Conflicts:
	.travis.yml
Fix merge conflicts