changes on dev branch
changes from Company
changes form Home
Merge pull request #1 from charlesyao/dev

Merge from Dev