BUGFIX: adds valid token for localhost in token.js file
Adds pause, play, next functionality to player
changes song end time marker to fall within a second of completion
fixes token merge conflict
Makes player pause, play, and next button functional.
Merge branch 'master' into player_button
adds nokogiri gem and dependencies from merge with origin master
moves player functionality under player object
Merge pull request #37 from waneka/player_button

Player functionality