check bootstrap
Merge branch 'master' of github.com:byzg/byzg-snake

Conflicts:
	app/assets/javascripts/application.js