added online rules to index, and removed new passwords from connects
hopefully accommodating remote change; pulled new passwords
hopefully resolving conflictsMerge branch 'master' of https://github.com/mitsg/osq

Conflicts:
	lamp-app/questionsJson.php
	lamp-app/sp.php
	lamp-app/vote.php