Revised code so it would run faster and added new file, as based on the last-minute assignment revision
Merge remote-tracking branch 'origin/master'