commit java
commit new java
test merge
test merge
test merge
test com
Merge branch 'master' of github.com:natepboat/Test-Git

Conflicts:
	Home.txt~