Updating hw2, better functions
Wrapping up hw2