Merge branch 'nate_branch'
Merge branch 'nate_branch'
Merge pull request #1 from jmscholen/nate_branch

Scaffolding, models, and views
Merge branch 'master' of https://github.com/jmscholen/to_do_pair_programming_app3
Merge branch 'master' of https://github.com/jmscholen/to_do_pair_programming_app3
Merge branch 'master' into jeffs_branch
Committing changes to reflect search function, nonworking
Merge branch 'jeffs_branch'
Merge branch 'master' into nate_branch
Added bootstrap