Windows
Merge branch 'master' of https://github.com/juansahe/col_rents

Conflicts:
	app/views/users/new.html.erb
Scripts at bottom