Resolved merge conflict
Merge pull request #5 from Lugghawk/upstream

Added Search feature for quotes.