Gazler/githug — pull request #138 by paulperegud (2013-11-12 09:36:10+00:00)
Title: Improved task wording in levels/conflict

While we usually merge branches into master, more precise wording should be used in this case. After all, this is a learning tool.