commit before merge on windows..
Merge remote-tracking branch 'origin/master'

Conflicts:
	log_antenna.py
	nec2utils.py
	simulate.bat