More factory work.
Merge branch 'master' of https://github.com/justinhennessy/dm-challenge

Conflicts:
	spec/factories/challenge.rb