Added attributes to ignore CR/LF End Of Line differences
Merge with master
Merge branch 'master' of https://github.com/ismb/jemma

Conflicts:
	.gitattributes