Added timer to sort page
Working on timers
Updated timer to work on sort page
Points working on 'Sort' page
Timer working on 'Crunch' page
Attempting to resolve merge conflicts
Merge branch 'development' of https://github.com/mailcrunch/deployment into development

Conflicts:
	client/crunch/crunch.js
	client/note/note.js
Still working on merge conflicts
Updated timer and fixed merge conflicts
Fixed 'Crunch' page bug from DBpipe
Working on timer on Crunch page
Updated points and timer for 'Crunch' page
Added 'Crunch'Em' button to 'Sort' page