Merge https://www.github.com/ajaycu90634/b-13calc into feature

Conflicts:
	test11.txt
d