Merge pull request #19 from Amoki/Ce-que-tu-veux

Ce que tu veux
Merge pull request #20 from Amoki/New-timer

New countdown
back to ids ....
Merge branch 'socketio' of github.com:Amoki/Remote-url-opener into url-to-id

Conflicts:
	static/js/usefullFunction.js
rename search method to query
Merge pull request #21 from Amoki/url-to-id

back to ids ....
Merge branch 'socketio' of https://github.com/Amoki/Amoki-Music into Better-template

Conflicts:
	player/views/client/library.py
	static/js/ajax.js
	templates/index.html