commit before pulling from repo
Fixing some strange merge issues
fixed minor issue with search