Fixed image to resemble what i managed to delete earlier...still missing som styling, but the basic functionality is there
Merge branch 'master' of github.com:SindreNordbo/radiomotor-android

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/no/radiomotor/android/MyActivity.java