Change pens to markers
Merge branch 'feature6'

* Adopted compromise solution for pencils vs. markers