Merge branch 'master' of https://github.com/medx75/harvest

Conflicts:
	my_harvester1
gitignore
Merge branch 'master' of https://github.com/medx75/harvest