committing before pulling nigel changes
committing before i pull nixon stuff
fixed merge conflicts
Merge branch 'development' of https://github.com/simensta/refrigeratory into accordion
ajax jquery working
pushing so nigel can work on heroku
fixed merge conflict
Merge pull request #50 from simensta/accordion

pushing so nigel can work on heroku