editing
Merge branch 'master' of github.com:rulises/cs380L_project