new file is created phuong_test
Merge branch 'master' of https://github.com/peace183/software_engineering_2014_template

This is a commit message