Votes!!!!!
Merge branch 'master' of github.com:RuthRainbow/OSAAT

Conflicts:
	sfc.php