Trying to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	01_Introduction.aux
	02_MathStrategies.aux
	03.1_NumbersOperations.aux
	03.2_NumbersOperations.aux
	03.3_NumbersOperations.aux
	03.4_NumbersOperations.aux
	03.5_NumbersOperations.aux
	03.6_NumbersOperations.aux
	03.7_NumbersOperations.aux
	03.8_NumbersOperations.aux
	03.9_NumbersOperations.aux
	04_AlgebraStrategies.aux
	05.1_AlgebraFunctionsI.aux
	05.2_AlgebraFunctionsI.aux
	05.3_AlgebraFunctionsI.aux
	05.4_AlgebraFunctionsI.aux
	05.5_AlgebraFunctionsI.aux
	06.1_AlgebraFunctionsII.aux
	06.2_AlgebraFunctionsII.aux
	06.3_AlgebraFunctionsII.aux
	06.4_AlgebraFunctionsII.aux
	06.5_AlgebraFunctionsII.aux
	06.6_AlgebraFunctionsII.aux
	07.1_GeometryMeasurementI.aux
	07.2_GeometryMeasurementI.aux
	07.3_GeometryMeasurementI.aux
	07.4_GeometryMeasurementI.aux
	08.1_GeometryMeasurementII.aux
	08.2_GeometryMeasurementII.aux
	08.3_GeometryMeasurementII.aux
	08.4_GeometryMeasurementII.aux
	09.1_GeometryMeasurementIII.aux
	09.2_GeometryMeasurementIII.aux
	10.1_Statistics.aux
	10.2_Statistics.aux
	10.3_Statistics.aux
	10.4_Statistics.aux
	11.10_WritingStrategies.aux
	11.11_WritingStrategies.aux
	11.12_WritingStrategies.aux
	11.1_WritingStrategies.aux
	11.2_WritingStrategies.aux
	11.3_WritingStrategies.aux
	11.4_WritingStrategies.aux
	11.5_WritingStrategies.aux
	11.6_WritingStrategies.aux
	11.7_WritingStrategies.aux
	11.8_WritingStrategies.aux
	11.9_WritingStrategies.aux
	12.1_SentenceImprovements.aux
	12.2_SentenceImprovements.aux
	12.3_SentenceImprovements.aux
	12.4_SentenceImprovements.aux
	12.5_SentenceImprovements.aux
	13.1_ParagraphStrategies.aux
	13.2_ParagraphStrategies.aux
	13.3_ParagraphStrategies.aux
	13.4_ParagraphStrategies.aux
	13.5_ParagraphStrategies.aux
	13.6_ParagraphStrategies.aux
	14.1_Essay.aux
	14.2_Essay.aux
	14.3_Essay.aux
	14.4_Essay.aux
	14.5_Essay.aux
	14.6_Essay.aux
	14.7_Essay.aux
	14.8_Essay.aux
	15.10_ReadingI.aux
	15.11_ReadingI.aux
	15.1_ReadingI.aux
	15.2_ReadingI.aux
	15.3_ReadingI.aux
	15.4_ReadingI.aux
	15.5_ReadingI.aux
	15.6_ReadingI.aux
	15.7_ReadingI.aux
	15.8_ReadingI.aux
	15.9_ReadingI.aux
	16.1_ReadingII.aux
	16.2_ReadingII.aux
	16.3_ReadingII.aux
	16.4_ReadingII.aux
	16.5_ReadingII.aux
	16.6_ReadingII.aux
	16.7_ReadingII.aux
	17.1_ReadingIII.aux
	17.2_ReadingIII.aux
	17.3_ReadingIII.aux
	17.4_ReadingIII.aux
	17.5_ReadingIII.aux
	18.1_Vocabulary.aux
	Acknowledgments.aux
	Student Manual 2.aux
	Student Manual 2.log
	Student Manual 2.pdf
	Student Manual 2.synctex.gz
	Student Manual 2.toc