changed erb to html erb
user can now add multiple ingredients at once from checkbox
now validation for a user to validate uniqueness of ingredients
the user pantry now shows what the user has
Merge pull request #26 from fiery-skippers-2014/searching_recipes

Searching recipes
added model test for useringredients
getting rid of random unesccasry things
styling wip
update controller test for users written
changing some styling
merging with master
added user can add ingredients feature test
Merge branch 'master' into pantry

just making sure no merge conflicts
fixed rspec test notice
Merge pull request #28 from fiery-skippers-2014/pantry

Pantry
search page about 80 percent done
fixed conflicts styled buttons
Merge pull request #29 from fiery-skippers-2014/styling

Styling
merged