ClipIt Quiz system
10/11/2014 17:30
Merge remote-tracking branch 'origin/master'