Cleaned up the HTML client; Worked with eventmachine a bit more to introduce a loop
Merge remote-tracking branch 'origin/master'