dummy
Merge branch 'master' of https://github.com/Yorek1664/Compil4Fantastic

Conflicts:
	fantastic4Lexer.java
	fantastic4Parser.java
Merge branch 'master' of https://github.com/Yorek1664/Compil4Fantastic