Merge pull request #3 from shaquille-young/issue-2

ref #2 import glyphicons
update from server
fixes #4 导航条修改
Merge pull request #5 from shaquille-young/issue-4

fixes #4 导航条修改
from server
ref #2 upgrade font-awesome