corrects typo from master

roomId had changed to channelName everywhere else in the document
 Please enter the commit message for your changes. Lines starting
removes references to roomId
sync_new_user no longer fires if user is first person in room
updateRoomState now syncs new user with room

- sync only occurs if user's player is not playing
- currentTime and play only occur after timeout due to streaming wait time
- sync trigger playlist update and display
getRoomState now return player pause state
updateRoomState only plays if room is playing
Merge branch 'master' of https://github.com/jonjchew/mylittledisco into update-state

- organizes play/pause logic
- updateRoomState now takes an song object
- getRoomState now sends a song object
- currentSong variable now stored in AudioPlayer
Conflicts:
	app/assets/javascripts/main.js
adds currentsong conditional to prevent errors

- users who join a room with no songs are no longer edge cases
setTimeout replaced with onloaddata event

- beforeLoad and afterLoad used to set benchmark time
new Date changed to Date.now() to prevent unecessary conversion
Merge branch 'master' of https://github.com/jonjchew/mylittledisco into update-state
removes white space
Merge pull request #17 from jonjchew/update-state

Update state