settings++
Merge branch 'master' of https://github.com/ndm25/EECS314