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

Conflicts:
	test11.txt