Some spekz
Working on feed specs
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
working on sort_feed specs
fixed merge conflicts
Full spec coverage on feed model
Merge branch 'rspec' of github.com:ashag/SeeMore into rspec

Conflicts:
	coverage/.resultset.json
	coverage/index.html
	spec/models/user_spec.rb