stuff
Merge branch 'master' of github.com:bscharm/retro

Conflicts:
	spec/features/create_board_spec.rb
	spec/features/users_spec.rb
changed methods in spec_helper.rb