update
Merge branch 'master' of https://github.com/tonyho15/juice-party.git
Added vote check, edited some html