Refactor
Save underscore to bower.json
Merge branch 'master' of github.com:AI-comp/TokiMemo

Conflicts:
	client/views/index.jade