Search function is now working
Resolved conflicts
SHA1 function done