Update Netcom, works now
Merge remote-tracking branch 'origin'

Conflicts:
	main.py
Merge