punkt 3.1
added division
Merge branch 'test'

Conflicts:
	lr3_1.3.1.cpp
combined test and master with change in strings