{"action":"created","comment":{"url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/comments/121528021","pull_request_review_id":43564499,"id":121528021,"diff_hunk":"@@ -1,3 +1,81 @@\n-p {\n-    text-align: center;\n-}\n+\r\n+body{\r\n+  background-color: cornflowerblue;\r\n+  margin: 0px;\r\n+}\r\n+\r\n+header{\r\n+   background-color: dimgray;\r\n+   color: #fff;\r\n+   margin: 0px;\r\n+}\r\n+\r\n+a{\r\n+  color: #454545;\r\n+  font-weight: normal;\r\n+  text-decoration: none;\r\n+}\r\n+\r\n+.site-title{\r\n+   color: #fff;\r\n+   padding: 10px\r\n+}\r\n+\r\n+h1{\r\n+  margin: 0px;\r\n+  font-weight: 400;\r\n+}\r\n+\r\n+\r\n+\r\n+.index-container {\r\n+  display: flex;\r\n+  flex-wrap: wrap;\r\n+  padding: 50px;\r\n+  padding-left: 20px;\r\n+  padding-right: 20px;\r\n+}\r\n+\r\n+.index-box {\r\n+//  max-width: 300px;\r\n+  flex: 1 51%;\r\n+  flex-grow: 1;\r\n+  background-color: #fff;\r\n+  border: 1px solid #ccc;\r\n+  padding: 20px;\r\n+  text-align: left;\r\n+  margin: 5px;\r\n+  font-size: 20px;\r\n+  display: flex;\r\n+  border-radius: 10px;\r\n+}\r\n+\r\n+.navbar {\r\n+   font-size: 22px;\r\n+   background-color: azure;\r\n+}\r\n+\r\n+.navlist {\r\n+   margin: 0;\r\n+   -webkit-margin-before: 0em;\r\n+   -webkit-margin-after: 0em;\r\n+}\r\n+\r\n+.navitem{\r\n+  display: inline-block;\r\n+  margin: 0px;\r\n+//  border-left: 2px solid;\r\n+//  border-right: 2px solid;\r\n+//  border-color: black;\r\n+}\r\n+\r\n+.navitem a {\r\n+   display: inline-block;\r\n+   color: #454545;\r\n+   padding: 10px ;\r\n+}\r\n+=======\r","path":"public/style.css","position":80,"original_position":80,"commit_id":"2b64b4596e531b74374faed5a78022210bf4d89e","original_commit_id":"2b64b4596e531b74374faed5a78022210bf4d89e","user":{"login":"Merfoo","id":2141272,"avatar_url":"https://avatars0.githubusercontent.com/u/2141272?v=3","gravatar_id":"","url":"https://api.github.com/users/Merfoo","html_url":"https://github.com/Merfoo","followers_url":"https://api.github.com/users/Merfoo/followers","following_url":"https://api.github.com/users/Merfoo/following{/other_user}","gists_url":"https://api.github.com/users/Merfoo/gists{/gist_id}","starred_url":"https://api.github.com/users/Merfoo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Merfoo/subscriptions","organizations_url":"https://api.github.com/users/Merfoo/orgs","repos_url":"https://api.github.com/users/Merfoo/repos","events_url":"https://api.github.com/users/Merfoo/events{/privacy}","received_events_url":"https://api.github.com/users/Merfoo/received_events","type":"User","site_admin":false},"body":"It appears remnants of a conflict are present in the file","created_at":"2017-06-12T21:12:34Z","updated_at":"2017-06-12T21:12:34Z","html_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator/pull/2#discussion_r121528021","pull_request_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2","_links":{"self":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/comments/121528021"},"html":{"href":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator/pull/2#discussion_r121528021"},"pull_request":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2"}}},"pull_request":{"url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2","id":125227794,"html_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator/pull/2","diff_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator/pull/2.diff","patch_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator/pull/2.patch","issue_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues/2","number":2,"state":"open","locked":false,"title":"Adds skeletal index.html and basic styling","user":{"login":"Atermonera","id":8475252,"avatar_url":"https://avatars0.githubusercontent.com/u/8475252?v=3","gravatar_id":"","url":"https://api.github.com/users/Atermonera","html_url":"https://github.com/Atermonera","followers_url":"https://api.github.com/users/Atermonera/followers","following_url":"https://api.github.com/users/Atermonera/following{/other_user}","gists_url":"https://api.github.com/users/Atermonera/gists{/gist_id}","starred_url":"https://api.github.com/users/Atermonera/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Atermonera/subscriptions","organizations_url":"https://api.github.com/users/Atermonera/orgs","repos_url":"https://api.github.com/users/Atermonera/repos","events_url":"https://api.github.com/users/Atermonera/events{/privacy}","received_events_url":"https://api.github.com/users/Atermonera/received_events","type":"User","site_admin":false},"body":"Smart, making a dev branch. The other codebase I work with is much more careful about testing, and had some bad experiences with a three-branch system before it split off, so we just submit tested code directly to the master branch","created_at":"2017-06-12T20:56:49Z","updated_at":"2017-06-12T21:12:34Z","closed_at":null,"merged_at":null,"merge_commit_sha":"04e84b427540f0d61e3112f5130acb51225bf910","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2/commits","review_comments_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2/comments","review_comment_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/comments{/number}","comments_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues/2/comments","statuses_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/statuses/2b64b4596e531b74374faed5a78022210bf4d89e","head":{"label":"Atermonera:master","ref":"master","sha":"2b64b4596e531b74374faed5a78022210bf4d89e","user":{"login":"Atermonera","id":8475252,"avatar_url":"https://avatars0.githubusercontent.com/u/8475252?v=3","gravatar_id":"","url":"https://api.github.com/users/Atermonera","html_url":"https://github.com/Atermonera","followers_url":"https://api.github.com/users/Atermonera/followers","following_url":"https://api.github.com/users/Atermonera/following{/other_user}","gists_url":"https://api.github.com/users/Atermonera/gists{/gist_id}","starred_url":"https://api.github.com/users/Atermonera/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Atermonera/subscriptions","organizations_url":"https://api.github.com/users/Atermonera/orgs","repos_url":"https://api.github.com/users/Atermonera/repos","events_url":"https://api.github.com/users/Atermonera/events{/privacy}","received_events_url":"https://api.github.com/users/Atermonera/received_events","type":"User","site_admin":false},"repo":{"id":94135015,"name":"final-project-topic-creator","full_name":"Atermonera/final-project-topic-creator","owner":{"login":"Atermonera","id":8475252,"avatar_url":"https://avatars0.githubusercontent.com/u/8475252?v=3","gravatar_id":"","url":"https://api.github.com/users/Atermonera","html_url":"https://github.com/Atermonera","followers_url":"https://api.github.com/users/Atermonera/followers","following_url":"https://api.github.com/users/Atermonera/following{/other_user}","gists_url":"https://api.github.com/users/Atermonera/gists{/gist_id}","starred_url":"https://api.github.com/users/Atermonera/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Atermonera/subscriptions","organizations_url":"https://api.github.com/users/Atermonera/orgs","repos_url":"https://api.github.com/users/Atermonera/repos","events_url":"https://api.github.com/users/Atermonera/events{/privacy}","received_events_url":"https://api.github.com/users/Atermonera/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Atermonera/final-project-topic-creator","description":"final-project-topic-creator created by GitHub Classroom","fork":true,"url":"https://api.github.com/repos/Atermonera/final-project-topic-creator","forks_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/forks","keys_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/teams","hooks_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/hooks","issue_events_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/issues/events{/number}","events_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/events","assignees_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/assignees{/user}","branches_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/branches{/branch}","tags_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/tags","blobs_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/git/refs{/sha}","trees_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/statuses/{sha}","languages_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/languages","stargazers_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/stargazers","contributors_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/contributors","subscribers_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/subscribers","subscription_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/subscription","commits_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/commits{/sha}","git_commits_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/git/commits{/sha}","comments_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/comments{/number}","issue_comment_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/issues/comments{/number}","contents_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/contents/{+path}","compare_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/merges","archive_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/downloads","issues_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/issues{/number}","pulls_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/pulls{/number}","milestones_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/milestones{/number}","notifications_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/labels{/name}","releases_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/releases{/id}","deployments_url":"https://api.github.com/repos/Atermonera/final-project-topic-creator/deployments","created_at":"2017-06-12T19:56:13Z","updated_at":"2017-06-12T21:10:07Z","pushed_at":"2017-06-12T21:10:05Z","git_url":"git://github.com/Atermonera/final-project-topic-creator.git","ssh_url":"git@github.com:Atermonera/final-project-topic-creator.git","clone_url":"https://github.com/Atermonera/final-project-topic-creator.git","svn_url":"https://github.com/Atermonera/final-project-topic-creator","homepage":null,"size":4,"stargazers_count":0,"watchers_count":0,"language":"HTML","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":"OSU-CS290-Sp2017:development","ref":"development","sha":"444ea18ec76677b54be71376a9b2df8bada87041","user":{"login":"OSU-CS290-Sp2017","id":26776009,"avatar_url":"https://avatars1.githubusercontent.com/u/26776009?v=3","gravatar_id":"","url":"https://api.github.com/users/OSU-CS290-Sp2017","html_url":"https://github.com/OSU-CS290-Sp2017","followers_url":"https://api.github.com/users/OSU-CS290-Sp2017/followers","following_url":"https://api.github.com/users/OSU-CS290-Sp2017/following{/other_user}","gists_url":"https://api.github.com/users/OSU-CS290-Sp2017/gists{/gist_id}","starred_url":"https://api.github.com/users/OSU-CS290-Sp2017/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OSU-CS290-Sp2017/subscriptions","organizations_url":"https://api.github.com/users/OSU-CS290-Sp2017/orgs","repos_url":"https://api.github.com/users/OSU-CS290-Sp2017/repos","events_url":"https://api.github.com/users/OSU-CS290-Sp2017/events{/privacy}","received_events_url":"https://api.github.com/users/OSU-CS290-Sp2017/received_events","type":"Organization","site_admin":false},"repo":{"id":93966618,"name":"final-project-topic-creator","full_name":"OSU-CS290-Sp2017/final-project-topic-creator","owner":{"login":"OSU-CS290-Sp2017","id":26776009,"avatar_url":"https://avatars1.githubusercontent.com/u/26776009?v=3","gravatar_id":"","url":"https://api.github.com/users/OSU-CS290-Sp2017","html_url":"https://github.com/OSU-CS290-Sp2017","followers_url":"https://api.github.com/users/OSU-CS290-Sp2017/followers","following_url":"https://api.github.com/users/OSU-CS290-Sp2017/following{/other_user}","gists_url":"https://api.github.com/users/OSU-CS290-Sp2017/gists{/gist_id}","starred_url":"https://api.github.com/users/OSU-CS290-Sp2017/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OSU-CS290-Sp2017/subscriptions","organizations_url":"https://api.github.com/users/OSU-CS290-Sp2017/orgs","repos_url":"https://api.github.com/users/OSU-CS290-Sp2017/repos","events_url":"https://api.github.com/users/OSU-CS290-Sp2017/events{/privacy}","received_events_url":"https://api.github.com/users/OSU-CS290-Sp2017/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator","description":"final-project-topic-creator created by GitHub Classroom","fork":false,"url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator","forks_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/forks","keys_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/teams","hooks_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/hooks","issue_events_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues/events{/number}","events_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/events","assignees_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/assignees{/user}","branches_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/branches{/branch}","tags_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/tags","blobs_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/git/refs{/sha}","trees_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/statuses/{sha}","languages_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/languages","stargazers_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/stargazers","contributors_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/contributors","subscribers_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/subscribers","subscription_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/subscription","commits_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/commits{/sha}","git_commits_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/git/commits{/sha}","comments_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/comments{/number}","issue_comment_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues/comments{/number}","contents_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/contents/{+path}","compare_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/merges","archive_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/downloads","issues_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues{/number}","pulls_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls{/number}","milestones_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/milestones{/number}","notifications_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/labels{/name}","releases_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/releases{/id}","deployments_url":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/deployments","created_at":"2017-06-10T21:35:17Z","updated_at":"2017-06-10T21:35:17Z","pushed_at":"2017-06-12T21:10:07Z","git_url":"git://github.com/OSU-CS290-Sp2017/final-project-topic-creator.git","ssh_url":"git@github.com:OSU-CS290-Sp2017/final-project-topic-creator.git","clone_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator.git","svn_url":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator","homepage":null,"size":3,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"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/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2"},"html":{"href":"https://github.com/OSU-CS290-Sp2017/final-project-topic-creator/pull/2"},"issue":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues/2"},"comments":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/OSU-CS290-Sp2017/final-project-topic-creator/statuses/2b64b4596e531b74374faed5a78022210bf4d89e"}}}}
{"actor":{"display_login":"Merfoo"}}