resolve .gitignore conflict
Merge branch 'master' of https://github.com/Sophen/cryxor2013-2

Conflicts:
	.gitignore