Joined Question 1 and 2

Rewrote Question 1 and 2 into one file with choice. All files have been
updated to accomodate this change.