FirstCommit - resultPage
Get JSONArray
ActionBar...
before first merge
Merge remote-tracking branch 'origin/resultPage' into get

Conflicts:
	MyPI Android/AndroidManifest.xml
	MyPI Android/bin/AndroidManifest.xml
	MyPI Android/bin/MyPI Android.apk
	MyPI Android/bin/classes.dex
	MyPI Android/bin/resources.ap_
	MyPI Android/res/drawable-mdpi/ic_launcher.png
	MyPI Android/res/values/strings.xml
	MyPI Android/res/values/styles.xml
	MyPI Android/src/kr/hansung/mypi/MainActivity.java
	MyPI Android/src/kr/hansung/mypi/ResultActivity.java
JungWon Add
before second merge
ActionBar Styling
Merge remote-tracking branch 'origin/resultPage' into get

Conflicts:
	MyPI Android/src/kr/hansung/mypi/ResultActivity.java
go cafe
try listview
140616 16:13
MainActivity
before edit
Before Merge
Merge remote-tracking branch 'origin/resultPage' into get

Conflicts:
	MyPI Android/AndroidManifest.xml
	MyPI Android/res/values/strings.xml
	MyPI Android/src/kr/hansung/mypi/ResultActivity.java
Merge1