Completed Project 2

Fixed issue #4 and issue #5

Requested ~350