Merge pull request #140 from ammoio/dev

Version 0.1
Small API doc fix
Queue is now updated when songs are dragged around when queue is live
Merge pull request #187 from alexmckenley/dev

Implemented seperate share view app
Shared view is now updated when the owner drags a song
Small API doc fix
Merge branch 'sort' into dev
Merge pull request #188 from deini/dev

Queue is now updated when songs are dragged around when queue is live
Merge branch 'css' into dev
Merge pull request #189 from alexmckenley/dev

CSS fixes
Implemented naive voting system
Merge branch 'thumb' into dev

Conflicts:
	public/views/search.html
Merge pull request #190 from malucky/dev

Implemented naive voting system
Random
fixed scrolling issue
Merge pull request #191 from alexmckenley/dev

fixed scrolling issue
Now showing results in order rdio>youtube>soundlouc
Merge branch 'spin' into dev
sidebar now updates on votes
Merge pull request #192 from deini/dev

Now showing results in order rdio > youtube > soundcloud