fix beach
Merge branch 'master' of https://github.com/ravinraven/cse170project
mered
blist make
Merge branch 'master' of https://github.com/ravinraven/cse170project
merged