fixed merge conflict related to the search box
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX