Commit 3rd and 4th homework
Commit 3rd and 4th homework
Merge remote-tracking branch 'origin/master'

Conflicts:
	addressbook/src/main/java/com/example/core/BaseTest.java
	addressbook/src/main/java/com/example/core/Config.java