working copy
working chat
new
most recent commit
omething

something:
dddddd
merge commit
git merge attempt from master
merge attempt from master
git commit attempt
merge repeated attempt
final merge attempt
Merge https://github.com/dokwon/mingle-android-client

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/11/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/17/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/1c/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/1d/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/1f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/49/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/50/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/62/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/63/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/68/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/6b/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/6d/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/71/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/79/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/7f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/8e/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/a9/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/b2/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/b7/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/ce/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/d8/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/ed/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/f4/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/fc/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/a0/fe/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/a0/5f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/e4/81/96/72/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.indexes/a0/62/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.location
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1000389100.index
	.metadata/.plugins/org.eclipse.jdt.core/2277131192.index
	.metadata/.plugins/org.eclipse.jdt.core/848856923.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/mingle/2014/7/27/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/mingle/2014/7/27/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
working merge copy
final merge commit