Sort songs by category
Playback options for songs
Fix song options styling bugs
Fix playback bugs
Fix conflicts
Merge pull request #16 from elihart/songs

Songs
Fix json parse bug when loading friends' conversation
Merge pull request #17 from elihart/json-bug

Fix json parse bug when loading friends' conversation
Reliable adapter for http to json repsonse without difficulty with
unreliable json response.
added documentation
Merge pull request #18 from CalvinFernandez/httprequests

reliable http requests
fixed conflicts