still working
Merge branch 'development' of https://github.com/simensta/refrigeratory into auto-filling-date
pulled withou conflicts
changed csv infinity inputs to 20yrs or 7304 days
fixed part-one of recipe algo
updated unit tests to reflect new invite model
Merge branch 'development' of github.com:simensta/refrigeratory into test-invitation-model
Merge pull request #57 from simensta/test-invitation-model

Test invitation model
opt out button added and ajaxed. pop in pop out feature added for all buttons except for recipes. search and invite bar not tested
opt out button added and ajaxed. pop in pop out feature added for all buttons except for recipes. search and invite bar not tested
Merge pull request #58 from simensta/accordion

opt out button added and ajaxed. pop in pop out feature added for all bu...
users are not redirected to home page if authentication fails
Merge pull request #60 from simensta/accordion

users are not redirected to home page if authentication fails
about to pull
pulled
Merge pull request #61 from simensta/recipe-algorithm

Recipe algorithm
adjusted csv to reflect important plurals
Merge branch 'development' of github.com:simensta/refrigeratory into adjust-csv
Merge pull request #62 from simensta/adjust-csv

Adjust csv
recipe needs to be refactored
invite is now ajaxed