merge
Merge branch 'master' of https://github.com/checkers-labs/rails.git

Conflicts:
	config/initializers/session_store.rb