Merge pull request #4 from nachokb/master

Amilcar preferences plus pet's name and S3
Merge branch 'master' of https://github.com/inaka/fyp-server