Merge commit '1d8c2dd01f0c70220ad0c346def047ad21537418' into network_realiseren

* commit '1d8c2dd01f0c70220ad0c346def047ad21537418':
  Changed '/' into '-'

Conflicts:
	main.c

Resolved by using 'mine'.