after change to xampp
Merge branch 'master' of http://github.com/vote-system/PHP

Conflicts:
	db_fns.php