Fixed the broken JS loading
Fixed merge conflicts
another commiti
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
sign-in buttons on access view are smaller and responsive now
Merge pull request #34 from tifs/master

sign-in buttons on access view are smaller and responsive now
Daily upstream pull
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
Merge pull request #35 from catlag/master

added modal for text input or drawing
New commits
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
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
Merge pull request #38 from catlag/master

got image to show up on save button
trying to add image to result page from games page