Changing Challenges
Merge remote-tracking branch 'origin/master'
Minor bug fixes
Modify Challenge words and times getters and setters