scac
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ClassMarks.apk
Merge remote-tracking branch 'origin/master'
PODER MODIFICAR NOTAS
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ClassMarks.apk
	bin/classes.dex
	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/ListAdapter.class
	bin/classes/com/tfd/classmarks/Presentacion.class
	bin/classes/com/tfd/classmarks/Principal.class
	bin/classes/com/tfd/classmarks/R$id.class
	bin/classes/com/tfd/classmarks/R$layout.class
	bin/classes/com/tfd/classmarks/R$string.class
	bin/classes/com/tfd/classmarks/R$style.class
	bin/resources.ap_
	gen/com/tfd/classmarks/R.java
	src/com/tfd/classmarks/FragmentAsig.java