update git ignore
Merge remote-tracking branch 'origin/compass_test_v0_0_2' into compass_test_v0_0_2

Conflicts:
	.gitignore