setup the project and initialisation
Merge branch 'master' of https://github.com/liy/farmland

Conflicts:
	.gitignore