Merge branch 'master' of https://github.com/JoeBarley/FarmCraft

Conflicts:
	README.md
README.md update