manual merge with origin/master
Merge remote-tracking branch 'origin/master'
added some test function (to create a bug without merge collisions)
pre merge manually
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.as