newest commit
Merge branch 'master' of C:\Users\gage heinrich\IdeaProjects\COCC_Abdroid with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	out/production/test_android/com/example/test_android/MyActivity$1.class
	out/production/test_android/com/example/test_android/MyActivity.class
	out/production/test_android/com/example/test_android/facebook_cocc.class
	out/production/test_android/com/example/test_android/google_map.class
	out/production/test_android/com/example/test_android/library$1parsingtable$1.class
	out/production/test_android/com/example/test_android/library$1parsingtable.class
	out/production/test_android/com/example/test_android/library.class
	out/production/test_android/com/example/test_android/web_view_login.class
	out/production/test_android/test_android.apk
	out/production/test_android/test_android.unaligned.apk
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/production/test_android/com/example/test_android/MyMap.class
added custom listview