rspec
Merge branch 'master' of https://github.com/netguru-training/pickadate

Conflicts:
	spec/controllers/event_controller_spec.rb
Merge branch 'master' of https://github.com/netguru-training/pickadate