Changed: .cproject files
Merge branch 'master' of https://github.com/Thywin/Thywin

Conflicts:
	source/parser/.cproject