seed.rb  for clubs and announcement
Merge branch 'Rails' of https://github.com/harbingernews/harbingernews into Rails

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Conflicts:
	db/seeds.rb