Test pull request

updated lab 2, working on getting it to compile then i'll finish building the functions.