Merge Assignemtn folder with master for Assignment Three