Added basic lyricoomodel
Merge pull request #4 from CalvinFernandez/master

Important api updates and ui snuck in
Clean up login and signup
Updated Conversation activity
Refactored routes to REST
Sort songs by category
Added comments and removed local testing params
Playback options for songs
Merge pull request #13 from CalvinFernandez/refactorModels

Refactor models
Fix song options styling bugs
Merge pull request #15 from elihart/refactorModel

Refactor model
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
Messaging ui stuff