complete changes

bdhu j change thai gaiu che
Merge branch 'master' of https://github.com/hbb20/gtu_pde

Conflicts: