s is a test
:x
this is a test file
Merge branch 'master' of https://github.com/jones415/javaproject2014

Conflicts:
	src/HelloAgain.java