df
Merge branch 'study_0.0.1' of git@github.com:stevenjsmin/mystudy.git
into study_0.0.1

Conflicts:
	DesignPattern/src/test/Test1Manager.java
	DesignPattern/src/test2/Test4Manager.java