Merge branch '6-apple' of https://github.com/zlqhem/CourseATF into 6-apple

Conflicts:
	tests/src/com/example/i2at/tc/test/TemperatureConverterTests.java
Merge branch '6-apple' of https://github.com/zlqhem/CourseATF into 6-apple