new logic for decay
fixes bug of double counting clicks
merge
changes the console.log value to studentID
Merge branch 'master' into wildstyles

Conflicts:
	client/App/Teacher/teacherCtrl.js
	client/App/Teacher/teacherFactory.js