changes on project to do test
Merge branch 'master' of https://github.com/Tonalicious/stringcalculator

Conflicts:
	bin/unit_test