?
Merge branch 'master' of https://github.com/katiecanada/cs221Project
added b&w and caching