primer commit
Merge branch 'master' of https://github.com/daniig/LSEL2013

Conflicts:
	reg_users.txt
control de vias y sensores funcionando