Fix c template bug
Fix empty line issue with c++ template
Use entire challenge id
Add solutions for challenge 18