updated instruction 1 master
Fixed merge conflicts - Merge branch 'master' into green-feature

Conflicts:
	instructions.txt