just a test
Merge branch 'master' into test-shanhe
add the demo-company page
Merge branch 'master' into test-shanhe
make the background white, add less/manta.less
make header more responsive
Merge branch 'test-shanhe' of github.com:mantacode/bootstrap into test-shanhe
move logo down to match current header
make search box expand on focus
make some rough decorations
solve the conflict
add Vegur Light and make headings use it
Merge branch 'test-shanhe' of github.com:mantacode/bootstrap into test-shanhe

Conflicts:
	dist/css/bootstrap.min.css
commit real version of bootstrap.min.css after merging
only apply vegur to h1 elements
Merge pull request #1 from mantacode/test-shanhe

round 1