merge settings
Merge github.com:hbcit2012software/IMS

Conflicts:
	.settings/org.eclipse.core.resources.prefs
gitignore