Hound as Rankia and Verema
now we are using Ruby 2.1.2
Merge pull request #35 from Soluciones/update-to-rails-3.2

Update to rails 3.2
Version change
Merge branch 'master' into migrate-to-postgresql
Change travis configuration
Merge branch 'migrate-to-postgresql' of github.com:Soluciones/news_tematica into migrate-to-postgresql

* 'migrate-to-postgresql' of github.com:Soluciones/news_tematica:
  Version change
  now we are using Ruby 2.1.2
  Hound as Rankia and Verema

Conflicts:
	.travis.yml
Use rake db:test:prepare instead of db:migrate

* The migrations are not working properly
new settings
We want Ruby 1.9 syntax
fixing rspec version
Merge pull request #38 from Soluciones/unifying-repos

new settings
Merge branch 'master' into migrate-to-postgresql

* master:
  fixing rspec version
  We want Ruby 1.9 syntax
  new settings

Conflicts:
	news_tematica.gemspec
Merge branch 'migrate-to-postgresql' into migrate-to-rails4

* migrate-to-postgresql:
  fixing rspec version
  We want Ruby 1.9 syntax
  new settings
  Use rake db:test:prepare instead of db:migrate
  Change travis configuration
  Version change
  now we are using Ruby 2.1.2
  Hound as Rankia and Verema