Ha
Merge branch 'master' of https://github.com/AugustoLD/MegaZordLanguage

Conflicts:
	src/Tokenizer.java
Ae