for xixi
Merge branch 'master' of https://github.com/Sissinothere/Calculator

Conflicts:
	Integers.cpp
	StringReader.cpp