moves shoulda matchers to test group in gemfile
Merge branch 'master' of github.com:kodgemisi/confdeck
fixes bug on conference creation
Merge branch 'master' of github.com:kodgemisi/confdeck

Conflicts:
	Gemfile