+kpass  (cryxor.cpp)
+ . and .. in gitignore
Merge branch 'master' of https://github.com/Sophen/cryxor2013-2

Conflicts:
	.gitignore