Merge pull request #69 from lucknessbuaa/master

modify the details and bugs
modify
modify
modify bower.json
Merge remote branch 'hello/master'
Merge remote branch 'hello/master'