index on master: f203c79 van alles
WIP on master: f203c79 van alles
Merge commit 'stash'

Conflicts:
	main.cpp