not idea
Merge branch 'updating-employees'

Conflicts:
	log/localeapp.yml
sample_data.rake
nn
nn
Merge remote-tracking branch 'origin/master'
arreglo conflicto sample.data.rake
ino se
modif
arreglos en menu y header