Fixed project

Lab1 up to part 7, need to redo includes