Committing from PyCharm
New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	AST Transformer/ASTReader.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Committing from PyCharm (2)
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASTTransformer/ASTManager.py
Committing from PyCharm (2)
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASTTransformer/ASTManager.py
Merge remote-tracking branch 'origin/master'
Fixed bug with duplicate names within different classes
Merge remote-tracking branch 'origin/master'
Added multiFileAST
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASTTransformer/ASTManager.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added multiFileAST
Added multiFileAST