1
Merge branch 'master' of https://github.com/WaterMe10n/WeatherCloset into 희찬
1
지금까지 한거
fragment중
바뀐거^_^
우선 한거 !
no message
Merge branch '희찬'

Conflicts:
	android/res/layout/activity_main.xml
	android/res/values/strings.xml
	android/src/com/comma/weathercloset/MainActivity.java