Fixed the broken JS loading
Fixed merge conflicts
another commiti
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
Daily upstream pull
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
New commits
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
changes for done button halfway done
git pulled and fixed results
Added share image function to code
Merge pull request #36 from robertragno/master

Added share image function
oved base64binary to vendor/assets
Merge pull request #37 from robertragno/master

moved base64binary to vendor/assets
got image to show up on save button(delete save button and move the image to show up on the results view when done is pressed)
Merge pull request #38 from catlag/master

got image to show up on save button
increase and reduce players
Merge branch 'master' of github.com:msyinmei/SketchPhraseV1
made changes to index page to increase and reduce players
Modifed scrollPage function and broke out the scroll functionality so that it is trigged after each modal.
Merge pull request #39 from robertragno/master

Modifed scrollPage function
changes to index access
plus minus buttons and removed modal from index page as well as toggled the sign in with a if else button