Start project
Merge branch 'master' of github.com:Telamonide/KOCMOC

Conflicts:
	mainwindow.cpp
Merge branch 'master' of github.com:Telamonide/KOCMOC

Conflicts:
	mainwindow.cpp