Box clock

I don't want to bug you via email, but i can't continue contributing until I sort out what's wrong with my fork. I want to merge one file (`mode/examples/Demos/Graphics/BoxClock/BoxClock.pyde`), but github is trying to merge everything committed upstream since June 11... I've tried everything I can think of to resolve it, short of deleting my fork and starting over (I'd like to avoid losing the history if I can).