Creado el proyecto base.
Merge branch 'master' of
https://github.com/KatsunetSolutions/Konitor.git

Conflicts:
	Konitor/src/com/katsunet/konitor/Main.java