Nota necesaria arreglado
ultima version
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ClassMarks.apk
	bin/classes.dex
	bin/classes/com/tfd/classmarks/FragmentAsig$1.class
	bin/classes/com/tfd/classmarks/FragmentAsig$2.class
	bin/classes/com/tfd/classmarks/FragmentAsig$3.class
	bin/classes/com/tfd/classmarks/FragmentAsig$4.class
	bin/classes/com/tfd/classmarks/FragmentAsig$5.class
	bin/classes/com/tfd/classmarks/FragmentAsig$6.class
	bin/classes/com/tfd/classmarks/FragmentAsig.class
	bin/classes/com/tfd/classmarks/Principal$2.class
	bin/classes/com/tfd/classmarks/Principal.class
	src/com/tfd/classmarks/FragmentAsig.java