1st commit
Merge pull request #2 from CS673-Project/FanghZ

1st commit