Java App for colloq -> continued (layout).
Merge branch 'master' of https://github.com/furylynx/MAE

Java App for colloq -> continued (layout).