working find or create by method
deleted code from isnta controller
Merge branch 'master' into callap
nonsene by calla
Merge pull request #63 from rmoshier/callap

Callap
working post objects with correct feed ids for associations
fixed merge
Merge pull request #64 from rmoshier/rebecca-drunk-programming

Rebecca drunk programming
Merge branch 'master' into kristen
clean up a few things