Fixed search
Fix merge conflicts
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets