Merge pull request #7 from alfrededison/staging

Staging
use megasearchupload for file searching (done)
Merge branch 'megasearchupload' into staging