Fixing stuff
Merge branch 'master' of https://github.com/JosafatV/StringProc

Conflicts:
	decriptor.cpp