haymez/Graphics-Lab — pull request #1 by haymez (2014-01-25 08:40:25+00:00)
Title: Editor

Merge editor with master so as to keep master up to date with working editor code