location mdoel basics
Merge branch 'master' of github.com:cotocisternas/ayudar.te

Conflicts:
	app/models/location.rb