fix Makefile problem (linux/windows are diff)
Merge branch 'master' of https://github.com/Sophen/cryxor2013-2

Conflicts:
	.gitignore
	Makefile.linux
merge gitignore