Merge branch 'master' into 'master'

two operants

See merge request !7

test/test.cpp

@@ -50,3 +50,9 @@ TEST_CASE( "Basic power test", "[calc]") {
   REQUIRE( evaluate("43^") == 64 );
   REQUIRE( evaluate("25^") == 32 );
 }
+
+TEST_CASE( "Two Operants in a row", "[calc]") {
+  //REQUIRE_THROWS( evaluate("11+3-+4") );
+  //REQUIRE_THROWS( evaluate("11/3*+4") );
+}
+