HW2 finished

Version 1, ready for check