added bfeeny progress
Merge branch 'master' of https://github.com/andrew-reece/cs171-final-project