Prep app for bugfix demo
Merge branch 'master' of github.com:traceyn/railsgirls

Conflicts:
	spec/models/idea_spec.rb