get latest
Updated parser Merge branch 'InitialBranch' of https://github.com/unplug1dot6/waffle into InitialBranch

Conflicts:
	parser.cpp
	token.cpp
	token.hpp