fgnwf;lkgnfelkgefwlgelkjeqlfkjvlkefgkerpodkpo
Merge branch 'master' of https://github.com/velebak/spaceapps

Conflicts:
	app/models/feed.rb
	db/schema.rb

annotated models