add new test file for test, obviously
Merge branch 'master' of git://github.com/fredlee590/test

Conflicts:
	testFile.txt