Removed this and String[] argument from main method.
Merge branch 'firm' of github.com:djrieger/mjplusplus into firm
Merge branch 'firm' of github.com:djrieger/mjplusplus into firm

Conflicts:
	src/ast/Statement.cpp