Merge pull request #23 from tifs/master

conflicts in html files are resolved and files are merged
trying out new things for clear button and added automatic canvas width based on screen
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
edited require in application.js and and edited javascript include tag in application.html.erb that fixed the cavas issue
Merge pull request #24 from catlag/master

Changes to fix the canvas issue on /games
authentication page set up using omniauth for facebook
removed turbolinks that was messing up canvas and not reloading head
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
finished auth
push push
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
test version
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1
Delete turbolinks
Merge pull request #25 from catlag/master

Deleted turbolinks to reload the header when start button is clicked
conflicts resolved