jambola2/MagicTutor — pull request #7 by jambola2 (2014-11-29 07:10:36+00:00)
Title: Merge pull request #6 from jambola2/master

Test: Merge with conflicts