conflict
Merge branch 'master' of github.com:SciLifeLab/facs
pulled the correct version from Roman
fix incorrect parameters for getopt in big_query.c
\r\n check for dos format text
dos and linux format extra line tolerant
elegant way of being extra line tolerant
Capital B for Bloom and threshold value instead of
classify help doc
Merge pull request #18 from tzcoolman/master

extra line tolerant