Charlie - Week 10 Individual assignment
Merge origin/master
Charlie - Week 11 Paired programming assignment
Merge origin/master