change user
Merge branch 'master' of https://github.com/dragonwarrior01/MP3Server

Conflicts:
	README.md
change user