First Commit
Merge branch 'master' of https://github.com/eltonio450/modal

Conflicts:
	src/Task/taskSendServerList.java