my changes to certain files so i can pull victor's stuff
Merge branch 'master' of github.com:mihail911/229-224N-Project