Edited routes
Fixed merge conflicts
Working on upload to s3
Merge branch 'master' of https://github.com/andrewjadams3/Classwork