resolve all the conflicts and add new pull #144

Open

harshcrop wants to merge 4 commits intopapistan:masterfrom

harshcrop:master

Commits on Oct 11, 2017

Commits on Oct 22, 2017

Merge https://github.com/papistan/FrontEndTrivia
harshcrop
committed