dev_1 add new function test3()
Merge branch 'dev' of github.com:troublegum/wheel into dev

Conflicts:
	f_dev_2.txt