Assignment 10, not making any exceptions anymore
Merge remote-tracking branch 'origin/master'