Added types
Added types
Merge branch 'master' of github.com:IceFist66/MiniCompiler

Conflicts:
	week2/april_9/parser/MiniLexer.java
	week2/april_9/parser/MiniParser.java
	week2/april_9/parser/TypeCheck.java