forgot some files
S3 fixes, gitignore
Merge branch 'master' of https://github.com/inaka/fyp-server
Merge pull request #5 from nachokb/master

forgot some files