some changes in launcher
Merge branch 'master' of https://github.com/lsom/acornchase.git
xyz
Merge branch 'master' of https://github.com/lsom/acornchase.git
stuff changed
Merge branch 'master' of https://github.com/lsom/acornchase.git

Conflicts:
	acornchase/src/acornchase/ui/Launcher.java
Merge branch 'master' of https://github.com/lsom/acornchase.git