official project1 commit

committing project 1 for Neil and Jordan