test committed
Merge https://github.com/mengdilin/mini-project