working find or create by method
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
change homepage styling
Merge branch 'master' into kristen
clean up a few things
allow users to logout and view homepage
rspec adventure
hot mess hot mess hot mess
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon

Conflicts:
	app/controllers/home_controller.rb
home ends?
make sure last 10 posts are for CURRENT USER
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon
changes
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon
spacing error
sort posts by posted_date
sort posts by posted_time, prevent duplicate posts