added total row
loader timeout
fixing merge
added in heart value in results.js, indexing in results.js
Merge branch 'divie_front'