Changed to Code::Blocks
Importing to Code::Blocks
Merge branch 'master' of https://github.com/turtlehunter/C__onsoler.git

Conflicts:
	main.cpp