주석을 추가하였습니다.
테스트테스트
2차 테스트 주석입니다.
수정
Merge branch 'develop' of https://github.com/DLUG/GameMafia.git into develop
주석입니다
wssss
주석
Merge branch 'develop' of https://github.com/DLUG/GameMafia.git into
develop

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

Conflicts:
	GameMafia/res/layout/activity_login.xml