nada
Merge branch 'master' of https://github.com/juansmacias/Sischok.git
trato de hacer merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/uniandes/sischok/R.java