updating my local repo
updating repo
working code
Latest working code with working search and voting button. however the app
will crash if voting button is pressed without being connected to
middleman.
adding new activity for play and pause
play button fixes and code transmission
jesses working code with search and radiobutton voting before merging with
alex.
Merge branch 'fragtabstest' of https://github.com/sismanis/Module2 into fragtabstest

Conflicts:
	FragmentPagerSupport/bin/FragmentPagerSupport.apk
	FragmentPagerSupport/bin/classes.dex
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$HomePageFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$MyAdapter$TabInfo.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$MyAdapter.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SocketConnect.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SongListFragment$1.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SongListFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$TCPReadTimerTask.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$VotingListFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$id.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$layout.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$menu.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$string.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$style.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$xml.class
	FragmentPagerSupport/bin/resources.ap_
	FragmentPagerSupport/gen/com/jmel/fragmentpagersupport/R.java
	FragmentPagerSupport/src/com/jmel/fragmentpagersupport/MainActivity.java
commited any recent changes
forward and back buttons
working forward and back
not working songs parsing
merging branches
Merge branch 'fragtabstest' of https://github.com/sismanis/Module2 into fragtabstest

Conflicts:
	FragmentPagerSupport/bin/FragmentPagerSupport.apk
	FragmentPagerSupport/bin/classes.dex
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$HomePageFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$MyAdapter$TabInfo.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$MyAdapter.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SocketConnect.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SongListFragment$1.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SongListFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$TCPReadTimerTask.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$VotingListFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity.class
	FragmentPagerSupport/src/com/jmel/fragmentpagersupport/MainActivity.java
Merge branch 'fragtabstest' into Fragments

Conflicts:
	FragmentPagerSupport/AndroidManifest.xml
	FragmentPagerSupport/bin/AndroidManifest.xml
	FragmentPagerSupport/bin/FragmentPagerSupport.apk
	FragmentPagerSupport/bin/classes.dex
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$HomePageFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$MyAdapter$TabInfo.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$MyAdapter.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SocketConnect.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$SongListFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$TCPReadTimerTask.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity$VotingListFragment.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/MainActivity.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$drawable.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$id.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$layout.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$menu.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$string.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$style.class
	FragmentPagerSupport/bin/classes/com/jmel/fragmentpagersupport/R$xml.class
	FragmentPagerSupport/bin/dexedLibs/android-support-v4-59d0c84e99483848cc586e4116d65c42.jar
	FragmentPagerSupport/bin/dexedLibs/android-support-v4-f186a7356fddd68dc655b04be3902c93.jar
	FragmentPagerSupport/bin/resources.ap_
	FragmentPagerSupport/gen/com/jmel/fragmentpagersupport/R.java
	FragmentPagerSupport/res/layout/activity_main.xml
	FragmentPagerSupport/res/values/strings.xml
	FragmentPagerSupport/src/com/jmel/fragmentpagersupport/MainActivity.java