Update Dockerfile
Merge branch 'master' of github.com:JonathanPorta/verb-api

Conflicts:
	Dockerfile