initial comit
Merge branch 'master' of https://github.com/itchy/farmer_tate

Conflicts:
	.gitignore