added A.
added A. and Prieto
Merge branch 'master' of https://github.com/armandorf/CS174_Hw3