Hangsolow/try_git — pull request #3 by Hangsolow (2012-10-21 17:53:00+00:00)
Title: refactored quiz

try merge with conflicts