init commit
install rspec cucum
install spork
fixed conflict