moving to bs3
merge conflict
Merge branch 'master' of github.com:captainhcg/me
icon of li