Combined tables in database

Edited Question class as necessary