tute/merit — pull request #178 by Ross-Hunter (2014-06-23 03:27:28+00:00)
Title: Updates documentation to be more clear

It took me a bit to realize that `has_merit` needs to be added to the model, since it's not in the installation instructions.

I also changed "Yearling" to "year-member", since it demonstrates the actual convention for naming badges.

Also one typo.