yan's student part 2
Merge branch 'pre-project' of github.com:jakers/static_picola into pre-project