jquery-2.1.1.js~
bootstrap 3.2.0 ~
bootstrap changed...
Merge remote-tracking branch 'origin/master'