ignore

Signed-off-by: Emmanuel Mathot <emmanuel.mahot@gmail.com>
Merge branch 'master' of github.com:Terradue/eowb-cckp

Signed-off-by: Emmanuel Mathot <emmanuel.mahot@gmail.com>

Conflicts:
	.gitignore
Merge branch 'master' of github.com:Terradue/eowb-cckp