2
Merged
Merge branch 'master' of git@github.com:stevenjsmin/mystudy.git

Conflicts:
	DesignPattern/src/headfirst/adapter/iterenum/EnumerationIterator.java