fixed stuff
Merge branch 'exercise.12' into exercise.13
removed error references