blop
blop
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser/bin/Debug/parsektest.exe
	parser/obj/Debug/Interpret.o
	parser/obj/Debug/main.o
	parser/obj/Debug/scanner.o
	parser/obj/Debug/vyraz.o
	parser/parsektest.depend
	parser/parsektest.layout
	parser/text.txt
Merge branch 'master' of https://github.com/vojtond/Bugfree-ninja