basic intro
Merge remote-tracking branch 'rilab/master'

Conflicts:
	Beginners_guide_to_farm.md