added song funcitonality
Merge branch 'master' of https://github.com/MarcoRmz/Jukebox

Conflicts:
	public/index.html