first commit in windows
fixed defects
Merge branch 'master' of github.com:palcalde/personal into windows

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
	app/views/main/home.html.erb
	config/database.yml
	config/routes.rb
	db/schema.rb
	script/rails
Merge branch 'master' of github.com:palcalde/personal into windows
removed conflict
Modified database.yml so it can work properly in windows potsgresql
Merge pull request #2 from palcalde/windows

First merge from Windows