maven update changes
gitignore problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	rhubarb.library/.gitignore
add settings