quiz + grunt
pseutoconflict readme fixed