hed320/Zadkine — pull request #1 by hed320 (2014-10-16 18:44:25+00:00)
Title: Merge remote-tracking branch 'origin/master'

Conflicts:
Motor/Motor.css
Motor/Motor.html