Where we're leaving off
Merge branch 'master' of github.com:jenniferahoward/ck-js-todo

Conflicts:
	bower.json
	test/indexSpec.js