Revert "bootstrao up"

This reverts commit 273a629b8cc7b848312d7fc953ac6de2b5f64ed7.
Revert "Revert "bootstrao up""

This reverts commit a1bde48abfa6cad72c5f0ff633a4a66348176e2f.
jQuery
12/20
Merge branch 'master' of https://github.com/noboo/test

Conflicts:
	_packages/css/layout.css