Initial commit
	new file:   .classpath
	new file:   README.md
	new file:   html/connection.js
	new file:   html/cover.png
	new file:   html/file-upload.js
	new file:   html/index.html
	new file:   html/style.css
	new file:   src/com/andreasackermann/musicsystem/AudioPlaybackRunnable.java
	new file:   src/com/andreasackermann/musicsystem/ClientSocketConnection.java
	new file:   src/com/andreasackermann/musicsystem/ClientSocketCreator.java
	new file:   src/com/andreasackermann/musicsystem/ClientSocketServlet.java
	new file:   src/com/andreasackermann/musicsystem/HelloHandler.java
	new file:   src/com/andreasackermann/musicsystem/MusicController.java
	new file:   src/com/andreasackermann/musicsystem/MusicServer.java
	new file:   src/com/andreasackermann/musicsystem/MusicServerException.java
	new file:   src/com/andreasackermann/musicsystem/MusicSystem.java
	new file:   src/com/andreasackermann/musicsystem/Song.java
	new file:   src/com/andreasackermann/musicsystem/UploadException.java
	new file:   src/com/andreasackermann/musicsystem/UploadHandler.java
	new file:   src/com/andreasackermann/musicsystem/UpvoteMusicController.java
	new file:   src/com/andreasackermann/musicsystem/Vote.java
Merge branch 'master' of https://github.com/andreasackermann/MusicVotes

Conflicts:
	README.md