will fix
ugh
Merge branch 'master' of https://github.com/brandon-dacrib/cloverleaf

Conflicts:
	.gitignore
	app/bundle/Gemfile.lock
	app/routes/api/play.rb
fixed