Resetting repo
Preparing for reset
Merge branch 'master' of https://github.com/ian0608/gtmymusic

Conflicts:
	server_thread.c
Final deletion for reset