switch
Merge branch 'master' of https://github.com/nefiltari/kerigan-ffxiv-crafting

Conflicts:
	test/test.coffee
Merge branch 'master' of https://github.com/nefiltari/kerigan-ffxiv-crafting