junk commit
"big commit"
Merge branch 'master' of https://github.com/kennysong/SATisfaction

Conflicts:
	client/dashboard.html
"junk"
"yeah"
Merge branch 'master' of https://github.com/kennysong/SATisfaction

Conflicts:
	client/dashboard.js
	client/popup.html