CraftyJS
Merge branch 'master' of https://github.com/Yoshiji/furry-archer

Conflicts:
	app/views/game/index.jade
	public/javascripts/application.js