committing before pulling for the day
fixed merge conflicts
Merge branch 'development' of https://github.com/simensta/refrigeratory into accordion
Merge pull request #46 from simensta/accordion

pushing all my stuff for the day