Including jquery and twiter bootrasp js
Merge remote-tracking branch 'origin/master'