Stuff that david did. Not sure why he put it directly to the server without going through git first
more stuff from david
Merge branch 'master' of https://github.com/westeras/vcf-analyzer

Conflicts:
	src/VcfParser/userInput.py