Merge branch 'jeffs_branch'
Merge branch 'master' into nate_branch
Added bootstrap
Merge branch 'nate_branch'
Merge pull request #2 from jmscholen/nate_branch

Nate branch
Merge branch 'master' of https://github.com/jmscholen/to_do_pair_programming_app3
Additional edits to search function
Merge branch 'master' into jeffs_branch