afalsario/commonart — pull request #9 by afalsario (2014-07-16 20:26:31+00:00)
Title: Afalsario

fixed conflicts