resolved merge conflicts
utf8 error fixed
Merge pull request #11 from hkxnyc/search_results

Search results