Finish Part 1 10-12
Fix merge conflicts
Merge pull request #1 from ianks/master

Questions 12-15