Merge pull request #7 from cgsmith/master

trivia game changes
Merge pull request #1 from mkepug/master

Test
6/10 meetup

changed question data structure, view, and fixed some tests.
Merge pull request #8 from devnuhl/master

6/10 meetup
Merge pull request #9 from jeremydee/master

Merge pull request #2 from mkepug/master
Merge pull request #1 from mkepug/master

Test PR from origin