add bower.json
modify bower.json
Merge branch 'master' of github.com:JoshuaYang/joshua-website-template