added description and fixed the merge in trivia
Merge branch 'master' of github.com:titse/final-project