Broke everything
Merge branch 'master' of https://github.com/myghty111/LabCompiler

Conflicts:
	Compiler/bin/compiler/CompilerTest.class
	Compiler/bin/compiler/MyVisitor.class
	Compiler/src/compiler/MyVisitor.java
	Compiler/test-output/Default suite/Default test.html
	Compiler/test-output/Default suite/Default test.xml
	Compiler/test-output/Default suite/testng-failed.xml
	Compiler/test-output/emailable-report.html
	Compiler/test-output/index.html
	Compiler/test-output/junitreports/TEST-compiler.CompilerTest.xml
	Compiler/test-output/old/Default suite/methods-alphabetical.html
	Compiler/test-output/old/Default suite/methods.html
	Compiler/test-output/old/Default suite/toc.html
	Compiler/test-output/old/index.html
	Compiler/test-output/testng-failed.xml
	Compiler/test-output/testng-results.xml
	Compiler/test/compiler/CompilerTest.java
	Parser/bin/grammar/Grammar.tokens
	Parser/bin/grammar/GrammarBaseVisitor.class
	Parser/bin/grammar/GrammarLexer.class
	Parser/bin/grammar/GrammarLexer.tokens
	Parser/bin/grammar/GrammarParser$AriExprContext.class
	Parser/bin/grammar/GrammarParser$BIGContext.class
	Parser/bin/grammar/GrammarParser$BOEContext.class
	Parser/bin/grammar/GrammarParser$BlockContext.class
	Parser/bin/grammar/GrammarParser$BolExprContext.class
	Parser/bin/grammar/GrammarParser$ControlStructureContext.class
	Parser/bin/grammar/GrammarParser$DivContext.class
	Parser/bin/grammar/GrammarParser$EQUContext.class
	Parser/bin/grammar/GrammarParser$ExprContext.class
	Parser/bin/grammar/GrammarParser$FunctionCallContext.class
	Parser/bin/grammar/GrammarParser$FunctionCallExpressionContext.class
	Parser/bin/grammar/GrammarParser$FunctionDeclarationContext.class
	Parser/bin/grammar/GrammarParser$IfContext.class
	Parser/bin/grammar/GrammarParser$IfelseContext.class
	Parser/bin/grammar/GrammarParser$IfthenContext.class
	Parser/bin/grammar/GrammarParser$MainBlockContext.class
	Parser/bin/grammar/GrammarParser$MinusContext.class
	Parser/bin/grammar/GrammarParser$MulContext.class
	Parser/bin/grammar/GrammarParser$NEQContext.class
	Parser/bin/grammar/GrammarParser$NumberContext.class
	Parser/bin/grammar/GrammarParser$ParansContext.class
	Parser/bin/grammar/GrammarParser$PlusContext.class
	Parser/bin/grammar/GrammarParser$PrintlnContext.class
	Parser/bin/grammar/GrammarParser$ProgramContext.class
	Parser/bin/grammar/GrammarParser$ProgramPartContext.class
	Parser/bin/grammar/GrammarParser$ProgramPartFunctionDefinitonContext.class
	Parser/bin/grammar/GrammarParser$SMAContext.class
	Parser/bin/grammar/GrammarParser$SOEContext.class
	Parser/bin/grammar/GrammarParser$StatementContext.class
	Parser/bin/grammar/GrammarParser$VarAssignmentContext.class
	Parser/bin/grammar/GrammarParser$VarDeclarationContext.class
	Parser/bin/grammar/GrammarParser$WhileLoopContext.class
	Parser/bin/grammar/GrammarParser.class
	Parser/bin/grammar/GrammarVisitor.class
	Parser/src/grammar/Grammar.tokens
	Parser/src/grammar/GrammarLexer.tokens
	Parser/src/grammar/GrammarParser.java