sdf gdgs sf
sdf
Merge branch 'master' of https://github.com/vojtond/Bugfree-ninja

Conflicts:
	parser/bin/Debug/parsektest.exe
	parser/obj/Debug/ial.o
	parser/text.txt