Merge pull request #11 from fiammara/master

docker-compose added