did some work
Merge branch 'master' of github.com:jkarson/mystoreProj
did work on find
fixed merge errors maybe
find almost working -- just some seg faults
fixed merge errors
fixed merge errors
added find functionality
fixed soo many merge errors goddamn