commit
Merge branch 'master' of https://github.com/SirJam/HLParser

Conflicts:
	HLParser/input.txt
Merge branch 'master' of https://github.com/SirJam/HLParser

Conflicts:
	HLParser/input.txt
d
Merge branch 'master' of https://github.com/SirJam/HLParser

Conflicts:
	HLParser/Parser.cpp
	HLParser/input.txt
Merge branch 'master' of https://github.com/SirJam/HLParser

Conflicts:
	HLParser/input.txt
generator =, init
Merge branch 'master' of https://github.com/SirJam/HLParser

Conflicts:
	HLParser/input.txt