Sol 1
Merge branch 'master' of https://github.com/EnSoftCorp/ScriptingProblems.git
Merge branch 'master' of https://github.com/EnSoftCorp/ScriptingProblems.git
Merge branch 'master' of https://github.com/EnSoftCorp/ScriptingProblems.git
Merge branch 'master' of
https://github.com/EnSoftCorp/ScriptingProblems.git

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/EnSoftCorp/ScriptingProblems.git
ProblemSet 3 Xing Yan