mychanges
Merge branch 'master' of github.com:SchuylerM/octocat

Conflicts:
	LearndingSomeJava/src/DataStructuresIntro.java