Polls Works
Merge remote-tracking branch 'origin/master'

Conflicts:
	LoginScript.php
	databaseClass.php