mac 7/24
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataStructure/src/Hack/helpMike/Solution.java
mac 7/24