Merge branch 'rangeInList'

resolved conflicts and merge rangeInList in master.

Conflicts:
	HelpMe.md
	diceparser.cpp
	parsingtoolbox.cpp
	result/result.cpp
	result/stringresult.h

1 files changed, 11 insertions, 2 deletions

diff --git a/node/startingnode.cpp b/node/startingnode.cpp
index 7e13f5d..5f1966e 100644
--- a/node/startingnode.cpp
+++ b/node/startingnode.cpp
@@ -32,10 +32,19 @@ void StartingNode::run(ExecutionNode*)
         m_nextNode->run(this);
     }
 }
-QString StartingNode::toString() const
+QString StartingNode::toString(bool withlabel) const
 {
-    return "StartingNode [shape=box]";
+	if(withlabel)
+	{
+		return QString("%1 [label=\"StartingNode\"]").arg(m_id);
+	}
+	else
+	{
+		return m_id;
+	}
 }
+
+
 qint64 StartingNode::getPriority() const
 {
     qint64 priority=0;