Ignore files
Merge branch 'master' of https://github.com/annuh/UT-SOA

Conflicts:
	apache-tomcat-6.0.39/webapps/ode/WEB-INF/derby-jpadb/db.lck
	apache-tomcat-6.0.39/webapps/ode/WEB-INF/derby-jpadb/log/log.ctrl
	apache-tomcat-6.0.39/webapps/ode/WEB-INF/derby-jpadb/log/log1.dat
	apache-tomcat-6.0.39/webapps/ode/WEB-INF/derby-jpadb/log/logmirror.ctrl
	apache-tomcat-6.0.39/webapps/ode/WEB-INF/derby-jpadb/seg0/c10.dat
	apache-tomcat-6.0.39/webapps/ode/WEB-INF/derby-jpadb/seg0/c230.dat
Ignore rules
ignore