Updating readme and tidy up
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/affirmation/runners/AffirmationRunner.java