playtime
Merge branch 'master' of https://github.com/suzannea86/depot

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb