주석하나 더 추가햇습니다.
주석 한개더달음 ㅎㅎ
ㅎㅇ
종석 테스트
종석테스트
종석테스트
Merge branch 'develop' of https://github.com/DLUG/GameMafia.git into
develop

Conflicts:
	GameMafia/src/com/anyway/android/gamemafia/LoginActivity.java
hi
Merge branch 'develop' of https://github.com/DLUG/GameMafia.git into
develop

Conflicts:
	GameMafia/res/layout/activity_login.xml
Merge branch 'develop' of https://github.com/DLUG/GameMafia.git into
develop
practice
practice