Renamed a bunch of files, updated server.
Merge branch 'master' of https://github.com/musalbas/musicalpackets
Merged in, fixed conflict.
Conflicts:
	html/index.html