made new branch
Merge branch 'master' into challenge
added test for Challenge model, added Challenge model
Merge pull request #5 from lion-of-conquest/challenge

Added Challenge model and tests.