added codeblocks project
merge stuff