Étape avant merge
Merge branch 'master' of https://github.com/stevenremot/RaSKlett
Merge branch 'master' of https://github.com/stevenremot/RaSKlett
commit le noveau
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/compiler/parser/Parser.java
	src/compiler/parser/SemanticalAnalyser.java
	src/compiler/parser/lexicalAnalyser.java
Merge branch 'master' of https://github.com/stevenremot/RaSKlett