vonatos
Merge branch 'master' of https://github.com/szabadkai/rSNP_database

Conflicts:
	cgi-bin/uploadbed.py