s
Merge branch 'master' of https://github.com/bin1001/MyRepos

Conflicts:
	MyTestProject/src/com/bin/main/MainTest.java