Combined tables in database

Edited Question class as necessary
Merge pull request #4 from jschultz311/patch-4

Combined tables in database