Several changes.
Merge branch 'master' of https://github.com/antoyo/c--

Conflicts:
	src/Generator/Generator.cpp
	src/Parser/FunctionDefinition.hpp