Merge branch 'master' of https://github.com/apaw/165B-Project1
Merge branch 'master' of https://github.com/apaw/165B-Project1
Merge branch 'master' of https://github.com/apaw/165B-Project1
added my name to name.txt
Merge pull request #5 from JonoEPD/master

added my name