First Commit
Merge branch 'proj3' of https://github.com/Noldan/eecs281 into proj3