added js for blog info
Merge branch 'dev' of C:\xampp\htdocs\pautina with conflicts.
Merge remote-tracking branch 'origin/dev' into dev