blabla
Merge branch 'master' of https://github.com/bioinfocoderz/Docs

Conflicts:
	Doc/Annotations/embl.pyc
	Doc/Features.rst
	Doc/Features/__init__.pyc
	Doc/_build/doctrees/Features.doctree
	Doc/_build/doctrees/environment.pickle
	Doc/_build/doctrees/index.doctree
	Doc/_build/doctrees/modules.doctree
	Doc/_build/html/Features.html
	Doc/_build/html/Introduction.html
	Doc/_build/html/_sources/Features.txt
	Doc/_build/html/_sources/index.txt
	Doc/_build/html/_sources/modules.txt
	Doc/_build/html/genindex.html
	Doc/_build/html/index.html
	Doc/_build/html/objects.inv
	Doc/_build/html/py-modindex.html
	Doc/_build/html/searchindex.js
	Doc/index.rst
	Doc/snpMat.pyc