initial commit
Merge https://github.com/douglasputnam/cs132lab8