initial commit of project
Merge https://github.com/lorenm5/480b-project