ignore matlab temp files
Create a test for demoDetuneFP
Merge branch 'test-infrastructire' into Optickle2-nicolas

Conflicts:
	.gitignore
fixed misspelling of warning
Merge branch 'test-infrastructire' into Optickle2-nicolas