resolved bug with display of answers
resolved conflict.

Merge branch 'master' of github.com:thetaris/extralife

Conflicts:
	peercheck/access.R