Conflicts:
	README.md
	src/main/scala/daisy/Component.scala
	src/main/scala/daisy/Context.scala
	src/main/scala/daisy/Main.scala
	src/main/scala/daisy/analysis/AbsErrorPhase.scala
	src/main/scala/daisy/analysis/RangeErrorPhase.scala
	src/main/scala/daisy/analysis/SpecsProcessingPhase.scala
	src/main/scala/daisy/backend/CodeGenerationPhase.scala
	src/main/scala/daisy/frontend/ASTExtractors.scala
	src/main/scala/daisy/lang/Identifier.scala
	src/main/scala/daisy/lang/PrettyPrinter.scala
	src/main/scala/daisy/lang/ScalaPrinter.scala
	src/main/scala/daisy/lang/Trees.scala
	src/main/scala/daisy/tools/FinitePrecision.scala
	src/main/scala/daisy/tools/RoundoffEvaluators.scala
	src/main/scala/daisy/utils/DebugSection.scala
	src/main/scala/daisy/utils/Interval.scala
	src/main/scala/daisy/utils/IntervalSubdivision.scala