Merge branch 'trainee_answers'
Update instructions.md
Update instructions.md
Update instructions.md
Add things to read for yaml and json
Merge branch 'master' into author_answers

Conflicts:
	data/fileformats/instructions.md