w/out spork
fixed spork
Merge branch 'spork'

Conflicts:
	Gemfile
	Guardfile
fixed spork