got if and if/else statements to work
Merge branch 'master' of git-personal:dmallon/compiler

Conflicts:
	Compiler/src/Analyzer.py