error handling and git pushing
Merge remote-tracking branch 'origin/master'

Conflicts:
	build-prepare.bat