add realtime chat feature, angular on rails
cleaned up gemfile, dependencies
fixed minor styling in playlist
player not working
merging mediaplayer with realtime
new realtime functions include 'now playing' on/off, voting incrementer and reset. audio still not working
new realtime functions include 'now playing' on/off, voting incrementer and reset. audio still not working
audio player working
first merge attempt
successful merge with realtime
test flag s, ours
test flag s ours
test

branch 'testmerge' into testmerge2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ines starting with '#' will be ignored, and an empty message aborts
# the commit.
test
test
test
about to merge with master