Updating Challenge classes to new interface

Challenges now take a map from instructions to number permitted to be
used
Fixing javadoc thing for eclipse

The tooltip wasn't displaying properly.