go

Signed-off-by: pjk0701 <applepie701@hanmail.net>
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3

Conflicts:
	AndroidManifest.xml
	src/com/JoonKyung/ListActivity.java