worked on console.cpp
Merge branch 'master' of https://github.com/fweakout/datChat

Conflicts:
	console.cpp