Merge pull request #5 from nollenr2/master

Ready to Pull.
Added a bottle_type and started search functionality