added experimental branch
Merge branch 'experimental'

Conflicts:
	main.cpp