Merge branch 'master' into jeffs_branch
Merge branch 'master' into jeffs_branch
Edited Search Header
Merge branch 'jeffs_branch'

Conflicts:
	to_do_pair/app/views/to_dos/index.html.haml