Update .gitignore
llll
Merge remote-tracking branch 'origin/master'

Conflicts:
	derby.log
jar
merge
Merge branch 'master' of
https://github.com/batmaster/OrderTrackingService.git

Conflicts:
	derby.log
	src/ku/trackingorder/resource/OrderResource.java