Fixed a bunch of missing yml files
Merge branch 'master' of github.com:jmhertlein/CS206-Project
Fixed someone else's merge conflict