initial work on docker
Merge branch 'master' into intinig/docker-fantasies
changes to .gitignore
Merge remote-tracking branch 'origin/master' into intinig/docker-fantasies
first draft of docke image
adding dockerized redis
custom branch
first working dockerized version
moved nginx into the equation
Merge pull request #3 from mikamai/intinig/docker-fantasies

Intinig/docker fantasies
Merge remote-tracking branch 'origin/master' into gawaine/google_oauth2

Conflicts:
	Gemfile.lock