hw 5 is as done as it is going to be. but i need to merge maddy's stuff
maddy's stuff is in here now
fixed conflicts with michelle's stuff