added bootstrap core
updated layout
Merge branch 'remote'