new commit 13
merge test
Merge branch 'master' of https://github.com/Tyler-Kwok/GitTest.git

Conflicts:
	GitTest/src/GitTest/GitTest.java