Jasyer/Homework — pull request #1 by Jasyer (2013-11-12 18:44:24+00:00)
Title: master

merge master1&master in master