second version
Merge branch 'master' of https://github.com/yaoxisheng/VE489_project