uploader updated!
Merge branch 'master' of https://github.com/mtjoe/theclubbiz-website

Conflicts:
	theclubbiz-website/db/schema.rb
	theclubbiz-website/db/seeds.rb
iuhiun