test
Merge branch 'master' of https://github.com/nicopretorius/DataCat

Conflicts:
	.gitignore
Fixed GitIgnore to ifgnore trash