Added some more questions. Minor bug fixes. Question 15 doesn't work btw.
Merge remote-tracking branch 'origin/master'