ignoring
Merge branch 'master' of github.com:netrebel/javarepo

Conflicts:
	.gitignore