Added layout and bootstrap, and jquery.
Merge branch 'layout'