titanium client works
Merge branch 'master' of https://github.com/jasonwupilly/GLaDOS

Conflicts:
	src/server/server/httpserver/c#/SimpleHttpServer/bin/Debug/input.wav
	src/server/server/httpserver/c#/SimpleHttpServer/bin/Debug/input.wav.flac