add on testing branch
Merge branch 'testing'

Conflicts:
	main.cpp