final version for Sprint 3
updated the +/- button for voting detail
updated the cancel button on adminSignUp.html
correct create typo; add descritpions to risk assessment ballot; update README and upload user and developer manual
Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	Viewresults.php
	addrisksFrontEnd.php
	setupproject.php
Fix conflicts