arturoc/openFrameworks — pull request #26 by danoli3 (2014-11-24 12:46:02+00:00)
Title: Fix for Merge Conflict

After this good to merge in ;D!