Fixed editchallengelist.jade bug FINALLY
Merging weirdness..just committed generate_output.js and challenges_backup.txt because git told me to
Trying to fix merge errors...