Final commit of the programming assignment 2