working on rspec
Merge branch 'master' of github.com:ashag/SeeMore into rspec
Merge branch 'master' of github.com:ashag/SeeMore into rspec
Merge branch 'master' of github.com:ashag/SeeMore into rspec
saves some coverage and removed raise
Merge branch 'master' of github.com:ashag/SeeMore into rspec
Some spekz
Merge branch 'master' of github.com:ashag/SeeMore into rspec
100% coverage of twitter_feed model
Working on feed specs
added simplecov to gitignore
Merge branch 'rspec' of github.com:ashag/SeeMore into rspec

Conflicts:
	coverage/.resultset.json
	coverage/index.html
Merge branch 'rspec' of github.com:ashag/SeeMore into rspec
feed spec validations
tested all of tumblr_feed minus the private methods
Merge branch 'master' of github.com:ashag/SeeMore into rspec
working on sort_feed specs
fixed merge conflicts
final twitter and tumblr feed specs, minus private methods; resolves limited coverage
resolving mege conflicts