Project 2

Added code to fix issues 6 and 12