test
Merge branch 'source'

Conflicts:
	index.html

test
fix
test
Merge branch 'source'

Conflicts:
	css2/cover.css
	css2/custom.css
	css2/jumbotron.css
	css2/sandstone.css
	css2/sandstone.min.css
	js2/ie10-viewport-bug-workaround.js

fix
fix
Merge branch 'source'

add fix