Merge branch 'master' into jeffs_branch
Merge branch 'nate_branch'
Merge pull request #3 from jmscholen/nate_branch

"updated css"
Merge branch 'master' into jeffs_branch
Edited Search Header
Merge branch 'jeffs_branch'

Conflicts:
	to_do_pair/app/views/to_dos/index.html.haml
Merge branch 'master' into nate_branch