Added jquery and bootstrap
Merged from new directory