Completed assignment

This commit is the completed programming assignment 2