Merge pull request #1 from mingnanwu/Dev

Dev
Merge branch 'master' of https://github.com/mingnanwu/BoostrapWebsite into Dev