update answer
update title
Merge remote-tracking branch 'origin/cyc' into freddiez

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/f14/team05/ExactAnswerAnnotator.java