-
http://gitlab.informatika.org/adwisatya/IF3230-Tugas-Besar-Sister-2015adwisatya authored
Conflicts: src/client/TheAlchemistClient/build/classes/thealchemist/gui/AlcLogon.class src/client/TheAlchemistClient/src/thealchemist/gui/AlcLogon.java
55fa3759