{"action":"created","comment":{"url":"https://api.github.com/repos/izzylee0/Midterm/pulls/comments/132358564","pull_request_review_id":55429283,"id":132358564,"diff_hunk":"@@ -137,50 +137,32 @@ var app = {\n \t\t\t$(\"#searchResults\").resizable();\n \t\t});\n \t\t\n+\t\t$(\"#save\").click(function() {\n+\n+\t\t\tsaveCanvas('test', 'jpg');\n+\n+\t\t});\n \n \t},\n \t\n \n };\n \n // global variable to hold onto the image\n-<<<<<<< HEAD\n-//var theImage;\n-=======\n ","path":"coopAndLastFM2.js","position":36,"original_position":36,"commit_id":"fde7eb0f1120484429306dd6560cb4c1bd173587","original_commit_id":"fde7eb0f1120484429306dd6560cb4c1bd173587","user":{"login":"callihiggins","id":716063,"avatar_url":"https://avatars3.githubusercontent.com/u/716063?v=4","gravatar_id":"","url":"https://api.github.com/users/callihiggins","html_url":"https://github.com/callihiggins","followers_url":"https://api.github.com/users/callihiggins/followers","following_url":"https://api.github.com/users/callihiggins/following{/other_user}","gists_url":"https://api.github.com/users/callihiggins/gists{/gist_id}","starred_url":"https://api.github.com/users/callihiggins/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/callihiggins/subscriptions","organizations_url":"https://api.github.com/users/callihiggins/orgs","repos_url":"https://api.github.com/users/callihiggins/repos","events_url":"https://api.github.com/users/callihiggins/events{/privacy}","received_events_url":"https://api.github.com/users/callihiggins/received_events","type":"User","site_admin":false},"body":"These are all merge conflicts, some things you have to pay attention to when you collaborate on a repo. Don't worry too much about this right now","created_at":"2017-08-10T03:50:55Z","updated_at":"2017-08-10T03:50:55Z","html_url":"https://github.com/izzylee0/Midterm/pull/2#discussion_r132358564","pull_request_url":"https://api.github.com/repos/izzylee0/Midterm/pulls/2","_links":{"self":{"href":"https://api.github.com/repos/izzylee0/Midterm/pulls/comments/132358564"},"html":{"href":"https://github.com/izzylee0/Midterm/pull/2#discussion_r132358564"},"pull_request":{"href":"https://api.github.com/repos/izzylee0/Midterm/pulls/2"}}},"pull_request":{"url":"https://api.github.com/repos/izzylee0/Midterm/pulls/2","id":135036192,"html_url":"https://github.com/izzylee0/Midterm/pull/2","diff_url":"https://github.com/izzylee0/Midterm/pull/2.diff","patch_url":"https://github.com/izzylee0/Midterm/pull/2.patch","issue_url":"https://api.github.com/repos/izzylee0/Midterm/issues/2","number":2,"state":"open","locked":false,"title":"Fixes","user":{"login":"callihiggins","id":716063,"avatar_url":"https://avatars3.githubusercontent.com/u/716063?v=4","gravatar_id":"","url":"https://api.github.com/users/callihiggins","html_url":"https://github.com/callihiggins","followers_url":"https://api.github.com/users/callihiggins/followers","following_url":"https://api.github.com/users/callihiggins/following{/other_user}","gists_url":"https://api.github.com/users/callihiggins/gists{/gist_id}","starred_url":"https://api.github.com/users/callihiggins/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/callihiggins/subscriptions","organizations_url":"https://api.github.com/users/callihiggins/orgs","repos_url":"https://api.github.com/users/callihiggins/repos","events_url":"https://api.github.com/users/callihiggins/events{/privacy}","received_events_url":"https://api.github.com/users/callihiggins/received_events","type":"User","site_admin":false},"body":"","created_at":"2017-08-10T03:49:15Z","updated_at":"2017-08-10T03:50:55Z","closed_at":null,"merged_at":null,"merge_commit_sha":"50d8dca79d57330467c1c5c9b862d5f36fc01160","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/izzylee0/Midterm/pulls/2/commits","review_comments_url":"https://api.github.com/repos/izzylee0/Midterm/pulls/2/comments","review_comment_url":"https://api.github.com/repos/izzylee0/Midterm/pulls/comments{/number}","comments_url":"https://api.github.com/repos/izzylee0/Midterm/issues/2/comments","statuses_url":"https://api.github.com/repos/izzylee0/Midterm/statuses/fde7eb0f1120484429306dd6560cb4c1bd173587","head":{"label":"callihiggins:master","ref":"master","sha":"fde7eb0f1120484429306dd6560cb4c1bd173587","user":{"login":"callihiggins","id":716063,"avatar_url":"https://avatars3.githubusercontent.com/u/716063?v=4","gravatar_id":"","url":"https://api.github.com/users/callihiggins","html_url":"https://github.com/callihiggins","followers_url":"https://api.github.com/users/callihiggins/followers","following_url":"https://api.github.com/users/callihiggins/following{/other_user}","gists_url":"https://api.github.com/users/callihiggins/gists{/gist_id}","starred_url":"https://api.github.com/users/callihiggins/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/callihiggins/subscriptions","organizations_url":"https://api.github.com/users/callihiggins/orgs","repos_url":"https://api.github.com/users/callihiggins/repos","events_url":"https://api.github.com/users/callihiggins/events{/privacy}","received_events_url":"https://api.github.com/users/callihiggins/received_events","type":"User","site_admin":false},"repo":{"id":99844980,"name":"Midterm","full_name":"callihiggins/Midterm","owner":{"login":"callihiggins","id":716063,"avatar_url":"https://avatars3.githubusercontent.com/u/716063?v=4","gravatar_id":"","url":"https://api.github.com/users/callihiggins","html_url":"https://github.com/callihiggins","followers_url":"https://api.github.com/users/callihiggins/followers","following_url":"https://api.github.com/users/callihiggins/following{/other_user}","gists_url":"https://api.github.com/users/callihiggins/gists{/gist_id}","starred_url":"https://api.github.com/users/callihiggins/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/callihiggins/subscriptions","organizations_url":"https://api.github.com/users/callihiggins/orgs","repos_url":"https://api.github.com/users/callihiggins/repos","events_url":"https://api.github.com/users/callihiggins/events{/privacy}","received_events_url":"https://api.github.com/users/callihiggins/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/callihiggins/Midterm","description":null,"fork":true,"url":"https://api.github.com/repos/callihiggins/Midterm","forks_url":"https://api.github.com/repos/callihiggins/Midterm/forks","keys_url":"https://api.github.com/repos/callihiggins/Midterm/keys{/key_id}","collaborators_url":"https://api.github.com/repos/callihiggins/Midterm/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/callihiggins/Midterm/teams","hooks_url":"https://api.github.com/repos/callihiggins/Midterm/hooks","issue_events_url":"https://api.github.com/repos/callihiggins/Midterm/issues/events{/number}","events_url":"https://api.github.com/repos/callihiggins/Midterm/events","assignees_url":"https://api.github.com/repos/callihiggins/Midterm/assignees{/user}","branches_url":"https://api.github.com/repos/callihiggins/Midterm/branches{/branch}","tags_url":"https://api.github.com/repos/callihiggins/Midterm/tags","blobs_url":"https://api.github.com/repos/callihiggins/Midterm/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/callihiggins/Midterm/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/callihiggins/Midterm/git/refs{/sha}","trees_url":"https://api.github.com/repos/callihiggins/Midterm/git/trees{/sha}","statuses_url":"https://api.github.com/repos/callihiggins/Midterm/statuses/{sha}","languages_url":"https://api.github.com/repos/callihiggins/Midterm/languages","stargazers_url":"https://api.github.com/repos/callihiggins/Midterm/stargazers","contributors_url":"https://api.github.com/repos/callihiggins/Midterm/contributors","subscribers_url":"https://api.github.com/repos/callihiggins/Midterm/subscribers","subscription_url":"https://api.github.com/repos/callihiggins/Midterm/subscription","commits_url":"https://api.github.com/repos/callihiggins/Midterm/commits{/sha}","git_commits_url":"https://api.github.com/repos/callihiggins/Midterm/git/commits{/sha}","comments_url":"https://api.github.com/repos/callihiggins/Midterm/comments{/number}","issue_comment_url":"https://api.github.com/repos/callihiggins/Midterm/issues/comments{/number}","contents_url":"https://api.github.com/repos/callihiggins/Midterm/contents/{+path}","compare_url":"https://api.github.com/repos/callihiggins/Midterm/compare/{base}...{head}","merges_url":"https://api.github.com/repos/callihiggins/Midterm/merges","archive_url":"https://api.github.com/repos/callihiggins/Midterm/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/callihiggins/Midterm/downloads","issues_url":"https://api.github.com/repos/callihiggins/Midterm/issues{/number}","pulls_url":"https://api.github.com/repos/callihiggins/Midterm/pulls{/number}","milestones_url":"https://api.github.com/repos/callihiggins/Midterm/milestones{/number}","notifications_url":"https://api.github.com/repos/callihiggins/Midterm/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/callihiggins/Midterm/labels{/name}","releases_url":"https://api.github.com/repos/callihiggins/Midterm/releases{/id}","deployments_url":"https://api.github.com/repos/callihiggins/Midterm/deployments","created_at":"2017-08-09T19:21:28Z","updated_at":"2017-08-09T19:21:30Z","pushed_at":"2017-08-10T03:47:53Z","git_url":"git://github.com/callihiggins/Midterm.git","ssh_url":"git@github.com:callihiggins/Midterm.git","clone_url":"https://github.com/callihiggins/Midterm.git","svn_url":"https://github.com/callihiggins/Midterm","homepage":null,"size":227,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"izzylee0:master","ref":"master","sha":"023486b82a13c85af2f5a35670581248e51634eb","user":{"login":"izzylee0","id":29986117,"avatar_url":"https://avatars2.githubusercontent.com/u/29986117?v=4","gravatar_id":"","url":"https://api.github.com/users/izzylee0","html_url":"https://github.com/izzylee0","followers_url":"https://api.github.com/users/izzylee0/followers","following_url":"https://api.github.com/users/izzylee0/following{/other_user}","gists_url":"https://api.github.com/users/izzylee0/gists{/gist_id}","starred_url":"https://api.github.com/users/izzylee0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/izzylee0/subscriptions","organizations_url":"https://api.github.com/users/izzylee0/orgs","repos_url":"https://api.github.com/users/izzylee0/repos","events_url":"https://api.github.com/users/izzylee0/events{/privacy}","received_events_url":"https://api.github.com/users/izzylee0/received_events","type":"User","site_admin":false},"repo":{"id":99042858,"name":"Midterm","full_name":"izzylee0/Midterm","owner":{"login":"izzylee0","id":29986117,"avatar_url":"https://avatars2.githubusercontent.com/u/29986117?v=4","gravatar_id":"","url":"https://api.github.com/users/izzylee0","html_url":"https://github.com/izzylee0","followers_url":"https://api.github.com/users/izzylee0/followers","following_url":"https://api.github.com/users/izzylee0/following{/other_user}","gists_url":"https://api.github.com/users/izzylee0/gists{/gist_id}","starred_url":"https://api.github.com/users/izzylee0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/izzylee0/subscriptions","organizations_url":"https://api.github.com/users/izzylee0/orgs","repos_url":"https://api.github.com/users/izzylee0/repos","events_url":"https://api.github.com/users/izzylee0/events{/privacy}","received_events_url":"https://api.github.com/users/izzylee0/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/izzylee0/Midterm","description":null,"fork":true,"url":"https://api.github.com/repos/izzylee0/Midterm","forks_url":"https://api.github.com/repos/izzylee0/Midterm/forks","keys_url":"https://api.github.com/repos/izzylee0/Midterm/keys{/key_id}","collaborators_url":"https://api.github.com/repos/izzylee0/Midterm/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/izzylee0/Midterm/teams","hooks_url":"https://api.github.com/repos/izzylee0/Midterm/hooks","issue_events_url":"https://api.github.com/repos/izzylee0/Midterm/issues/events{/number}","events_url":"https://api.github.com/repos/izzylee0/Midterm/events","assignees_url":"https://api.github.com/repos/izzylee0/Midterm/assignees{/user}","branches_url":"https://api.github.com/repos/izzylee0/Midterm/branches{/branch}","tags_url":"https://api.github.com/repos/izzylee0/Midterm/tags","blobs_url":"https://api.github.com/repos/izzylee0/Midterm/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/izzylee0/Midterm/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/izzylee0/Midterm/git/refs{/sha}","trees_url":"https://api.github.com/repos/izzylee0/Midterm/git/trees{/sha}","statuses_url":"https://api.github.com/repos/izzylee0/Midterm/statuses/{sha}","languages_url":"https://api.github.com/repos/izzylee0/Midterm/languages","stargazers_url":"https://api.github.com/repos/izzylee0/Midterm/stargazers","contributors_url":"https://api.github.com/repos/izzylee0/Midterm/contributors","subscribers_url":"https://api.github.com/repos/izzylee0/Midterm/subscribers","subscription_url":"https://api.github.com/repos/izzylee0/Midterm/subscription","commits_url":"https://api.github.com/repos/izzylee0/Midterm/commits{/sha}","git_commits_url":"https://api.github.com/repos/izzylee0/Midterm/git/commits{/sha}","comments_url":"https://api.github.com/repos/izzylee0/Midterm/comments{/number}","issue_comment_url":"https://api.github.com/repos/izzylee0/Midterm/issues/comments{/number}","contents_url":"https://api.github.com/repos/izzylee0/Midterm/contents/{+path}","compare_url":"https://api.github.com/repos/izzylee0/Midterm/compare/{base}...{head}","merges_url":"https://api.github.com/repos/izzylee0/Midterm/merges","archive_url":"https://api.github.com/repos/izzylee0/Midterm/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/izzylee0/Midterm/downloads","issues_url":"https://api.github.com/repos/izzylee0/Midterm/issues{/number}","pulls_url":"https://api.github.com/repos/izzylee0/Midterm/pulls{/number}","milestones_url":"https://api.github.com/repos/izzylee0/Midterm/milestones{/number}","notifications_url":"https://api.github.com/repos/izzylee0/Midterm/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/izzylee0/Midterm/labels{/name}","releases_url":"https://api.github.com/repos/izzylee0/Midterm/releases{/id}","deployments_url":"https://api.github.com/repos/izzylee0/Midterm/deployments","created_at":"2017-08-01T21:01:14Z","updated_at":"2017-08-02T02:26:41Z","pushed_at":"2017-08-10T03:49:16Z","git_url":"git://github.com/izzylee0/Midterm.git","ssh_url":"git@github.com:izzylee0/Midterm.git","clone_url":"https://github.com/izzylee0/Midterm.git","svn_url":"https://github.com/izzylee0/Midterm","homepage":null,"size":297,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/izzylee0/Midterm/pulls/2"},"html":{"href":"https://github.com/izzylee0/Midterm/pull/2"},"issue":{"href":"https://api.github.com/repos/izzylee0/Midterm/issues/2"},"comments":{"href":"https://api.github.com/repos/izzylee0/Midterm/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/izzylee0/Midterm/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/izzylee0/Midterm/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/izzylee0/Midterm/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/izzylee0/Midterm/statuses/fde7eb0f1120484429306dd6560cb4c1bd173587"}}}}
{"actor":{"display_login":"callihiggins"}}