two new classes added
Merge branch 'master' of https://github.com/LittleSpoon/potential-octo-shame

Conflicts:
	src/com/supinfo/client/view/cli/Launcher.java