added midterm prep to repo
updated naming convention in readme
added midterm solutions
merged conflicts