Including organisations.txt file + reading this file in db/seeds
Fixing specs
Merge branch 'master' into db_seeds

Conflicts:
	db/schema.rb
	db/seeds.rb
	spec/factories/factories.rb
Merge branch 'master' into db_seeds
Moving factories to spec/factories.rb
Merge branch 'master' into db_seeds

Conflicts:
	db/schema.rb
Merge pull request #44 from rhokbrisbane/db_seeds

Db seeds