try
User Settings
Merge branch 'master' of
ssh://git@github.com/ohadsch/AwesomePlaylists.git

Conflicts:
	AwesomePlaylists/AndroidManifest.xml
	AwesomePlaylists/res/layout/activity_main.xml
	AwesomePlaylists/res/values/strings.xml
	AwesomePlaylists/src/com/example/awesomeplaylists/MainActivity.java