updated ignore
Merge branch 'master' of https://github.com/JLChin/BusinessUI

Conflicts:
	.classpath
	.project