modified:   src/main/java/org/tuwien/swalab2/swazam/client/clientUI/Cli.java
Merge branch 'master' of github.com:msmolle/swa