Merge branch 'master' into jeffs_branch
Committing changes to reflect search function, nonworking
Merge branch 'jeffs_branch'