Change
Merge branch 'master' of github.com:hahoyer/reni.cpp

Conflicts:
	Reni/NumberToken.cpp
	Reni/Type.h