player create
Merge branch 'master' of github.com:ShinobiDevs/zoomtag

Conflicts:
	app/controllers/sessions_controller.rb