spec init
Merge branch 'master' of github.com:netguru/slaska

Conflicts:
	spec/controllers/orders_controller_spec.rb
	spec/controllers/sessions_controller_spec.rb
	spec/factories.rb
	spec/models/order_spec.rb
	spec/models/user_spec.rb
	spec/spec_helper.rb