yep
Syncinc things

Things that will be added to gitignore soon. What is an iml file
Updating gitignore

So I can actually work on this without git freaking out.
Created functionality that makes the user choose a playlist to play
fixing merge issues
"Proper" .idea gitignore

Using the guide found at http://stackoverflow.com/questions/16736856/what-should-be-in-my-gitignore-for-an-android-studio-project
regarding what .idea files to share and what to ignore.
Fixed issues with using others' playlists
Added some loading bars
Removed host and listen functionality for non-premium users
Fixing .gitignore
Fixing gitignore... maybe
Merging branches
Added untracked files
Added untracked files
Renaming classes
Git stuff