yan's 4/17 in class
Merge branch 'pre-project' of github.com:jakers/static_picola into pre-project
yan 4/17 part
Merge branch 'pre-project' of github.com:jakers/static_picola into pre-project