Notes
stupid merge fix
Clean up hw7; finish