question about style/file handling
working on factory
working on factory
Merge remote-tracking branch 'upstream/develop' into factory

Conflicts:
	lib/card/set.rb
working on factory
corrected typo
temporarily moved everything affected by factory to zfactory mod
the first factory specs
first 7 factory tests pass
fix (introduced a typo in some random spec file)
basic factoy is running
more specs for factory and supplier
working on factory and supplier
use factory module for stylesheets
added factory and supplier specs
javascript and stylesheet pipeline
added card creation helper,
handle rspec command line arguments
completed factory specs
added script setting
completed factory specs