s
Merge branch 'master' of https://github.com/isaac2830/postfix-calculator

Conflicts:
	calculator.cpp
S
Merge branch 'master' of https://github.com/isaac2830/postfix-calculator
F
Merge branch 'master' of https://github.com/isaac2830/postfix-calculator
f