Uploading bootstrap css, and js. along with templates folder
Merge remote-tracking branch 'upstream/master'