added total row
loader timeout
fixing merge
dictionary for pregs
added objective function
Merge branch 'master' of github.com:athuras/divie
added system preference
stable
added saving of user prefs
added saving of user prefs
added saving of user prefs
added saving of user prefs
added saving of user prefs
testing json in prefs
testing json in prefs
testing prefs submit
added in heart value in results.js, indexing in results.js
Merge branch 'divie_front'
testing prefs submit
Fixes for saving pregs