adapting the project to my codeblocs
cleaning somes comments
merging