initial work on docker
Merge branch 'master' into intinig/docker-fantasies
changes to .gitignore
Merge pull request #2 from mikamai/gi/post-in-linea

Add sinatra-reload for development
Merge remote-tracking branch 'origin/master' into intinig/docker-fantasies
first draft of docke image
adding dockerized redis
custom branch
added omniauth gems
spec for creating an account / login
Merge remote-tracking branch 'origin/master' into gawaine/google_oauth2
first working dockerized version
moved nginx into the equation
user model
Merge pull request #3 from mikamai/intinig/docker-fantasies

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

Conflicts:
	Gemfile.lock
User#change_karma_by specs
User#update_auth_token specs
Merge pull request #4 from mikamai/gi/post-in-linea

Inline submission preview