some thing conflict.
Merge branch 'master' of git@github.com:pakchoidora/campfire.git

Conflicts:
	src/index.js
	src/js/Game.js