Fixed + operator to accept lhs of type str
Merge branch 'master' of https://github.com/evenam/EverettScript

Conflicts:
	evaluate/evaluate/main.cpp