Zulukas/milestone-2

CS246 milestone 2 Kevin Andres