{"action":"created","comment":{"url":"https://api.github.com/repos/catherinev/quest_maker/pulls/comments/31873896","id":31873896,"diff_hunk":"@@ -1 +1,72 @@\n-# quest_maker\n+## About this application\n+QuestMaker is a web application that integrates with FitBit and makes exercise more rewarding by enabling users to easily create and participate in quests with their friends. In its simplest form, a quest is a series of milestones that users reach as they cover more distance over time. For users with FitBits, daily progress is updated automatically; for those without, manual entry is easy.\n+\n+The idea for this application comes from the [Walk to Rivendell Challenge](http://home.insightbb.com/~eowynchallenge/index.html), which provides a [series of waypoints](http://home.insightbb.com/~eowynchallenge/Tools/Bag_end/bag_end.html) for Frodo's walk across Middle Earth. Since its inception in 2003, many people have made the whimsical trek across Tolkien's Middle Earth by manually charting their mileage each day and sharing their progress with friends. QuestMaker personalizes and automates this process, allowing you to focus your energies on outwalking the rest of your ~~friends~~ ~~competitors~~ fellowship!\n+\n+\n+## Getting started\n+See [Getting Started](GettingStarted.md) for detailed info on how to set everything up on your machine.\n+\n+\n+## Running the test suite\n+TODO\n+\n+\n+## Git Workflow\n+\n+### To work on the app:\n+See [Getting Started](GettingStarted.md) for initial setup. Once you are set up, follow the following procedure to contribute code.\n+\n+#### A note on branch names:\n+* The production branch is ``master``.\n+* The development branch is ``develop``.\n+* Feature branches branch off from ``develop`` and are named ``feature-<description>``, e.g. feature-admin-editing.\n+* Hotfix branches are named ``hotfix-<description>``;  they may branch from develop or master and should be merged back into both.\n+\n+Thus, if you are working on a **new feature**, follow this procedure:\n+\n+First, pull down from develop (to make sure you're up-to-date) and create a new branch:\n+  ```\n+  git pull origin develop","path":"README.md","position":31,"original_position":31,"commit_id":"ecfcbfdf5d1436b5c6c4f7e3a3cf9f8b9abbb1c9","original_commit_id":"ecfcbfdf5d1436b5c6c4f7e3a3cf9f8b9abbb1c9","user":{"login":"catherinev","id":6765017,"avatar_url":"https://avatars.githubusercontent.com/u/6765017?v=3","gravatar_id":"","url":"https://api.github.com/users/catherinev","html_url":"https://github.com/catherinev","followers_url":"https://api.github.com/users/catherinev/followers","following_url":"https://api.github.com/users/catherinev/following{/other_user}","gists_url":"https://api.github.com/users/catherinev/gists{/gist_id}","starred_url":"https://api.github.com/users/catherinev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/catherinev/subscriptions","organizations_url":"https://api.github.com/users/catherinev/orgs","repos_url":"https://api.github.com/users/catherinev/repos","events_url":"https://api.github.com/users/catherinev/events{/privacy}","received_events_url":"https://api.github.com/users/catherinev/received_events","type":"User","site_admin":false},"body":"You should add ``git checkout develop`` at the beginning of this code block to emphasize that feature branches are branched off of develop.","created_at":"2015-06-07T04:41:43Z","updated_at":"2015-06-07T04:41:43Z","html_url":"https://github.com/catherinev/quest_maker/pull/4#discussion_r31873896","pull_request_url":"https://api.github.com/repos/catherinev/quest_maker/pulls/4","_links":{"self":{"href":"https://api.github.com/repos/catherinev/quest_maker/pulls/comments/31873896"},"html":{"href":"https://github.com/catherinev/quest_maker/pull/4#discussion_r31873896"},"pull_request":{"href":"https://api.github.com/repos/catherinev/quest_maker/pulls/4"}}},"pull_request":{"url":"https://api.github.com/repos/catherinev/quest_maker/pulls/4","id":37101285,"html_url":"https://github.com/catherinev/quest_maker/pull/4","diff_url":"https://github.com/catherinev/quest_maker/pull/4.diff","patch_url":"https://github.com/catherinev/quest_maker/pull/4.patch","issue_url":"https://api.github.com/repos/catherinev/quest_maker/issues/4","number":4,"state":"open","locked":false,"title":"Feature docs","user":{"login":"xanv","id":6484946,"avatar_url":"https://avatars.githubusercontent.com/u/6484946?v=3","gravatar_id":"","url":"https://api.github.com/users/xanv","html_url":"https://github.com/xanv","followers_url":"https://api.github.com/users/xanv/followers","following_url":"https://api.github.com/users/xanv/following{/other_user}","gists_url":"https://api.github.com/users/xanv/gists{/gist_id}","starred_url":"https://api.github.com/users/xanv/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xanv/subscriptions","organizations_url":"https://api.github.com/users/xanv/orgs","repos_url":"https://api.github.com/users/xanv/repos","events_url":"https://api.github.com/users/xanv/events{/privacy}","received_events_url":"https://api.github.com/users/xanv/received_events","type":"User","site_admin":false},"body":"Witness the firepower of these fully armed and operational docs!","created_at":"2015-06-07T04:30:53Z","updated_at":"2015-06-07T04:41:43Z","closed_at":null,"merged_at":null,"merge_commit_sha":"9c2bf633d695689b57d903dd0bb905e0547d2b54","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/catherinev/quest_maker/pulls/4/commits","review_comments_url":"https://api.github.com/repos/catherinev/quest_maker/pulls/4/comments","review_comment_url":"https://api.github.com/repos/catherinev/quest_maker/pulls/comments{/number}","comments_url":"https://api.github.com/repos/catherinev/quest_maker/issues/4/comments","statuses_url":"https://api.github.com/repos/catherinev/quest_maker/statuses/ecfcbfdf5d1436b5c6c4f7e3a3cf9f8b9abbb1c9","head":{"label":"catherinev:feature-docs","ref":"feature-docs","sha":"ecfcbfdf5d1436b5c6c4f7e3a3cf9f8b9abbb1c9","user":{"login":"catherinev","id":6765017,"avatar_url":"https://avatars.githubusercontent.com/u/6765017?v=3","gravatar_id":"","url":"https://api.github.com/users/catherinev","html_url":"https://github.com/catherinev","followers_url":"https://api.github.com/users/catherinev/followers","following_url":"https://api.github.com/users/catherinev/following{/other_user}","gists_url":"https://api.github.com/users/catherinev/gists{/gist_id}","starred_url":"https://api.github.com/users/catherinev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/catherinev/subscriptions","organizations_url":"https://api.github.com/users/catherinev/orgs","repos_url":"https://api.github.com/users/catherinev/repos","events_url":"https://api.github.com/users/catherinev/events{/privacy}","received_events_url":"https://api.github.com/users/catherinev/received_events","type":"User","site_admin":false},"repo":{"id":36630069,"name":"quest_maker","full_name":"catherinev/quest_maker","owner":{"login":"catherinev","id":6765017,"avatar_url":"https://avatars.githubusercontent.com/u/6765017?v=3","gravatar_id":"","url":"https://api.github.com/users/catherinev","html_url":"https://github.com/catherinev","followers_url":"https://api.github.com/users/catherinev/followers","following_url":"https://api.github.com/users/catherinev/following{/other_user}","gists_url":"https://api.github.com/users/catherinev/gists{/gist_id}","starred_url":"https://api.github.com/users/catherinev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/catherinev/subscriptions","organizations_url":"https://api.github.com/users/catherinev/orgs","repos_url":"https://api.github.com/users/catherinev/repos","events_url":"https://api.github.com/users/catherinev/events{/privacy}","received_events_url":"https://api.github.com/users/catherinev/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/catherinev/quest_maker","description":"make your own quest","fork":false,"url":"https://api.github.com/repos/catherinev/quest_maker","forks_url":"https://api.github.com/repos/catherinev/quest_maker/forks","keys_url":"https://api.github.com/repos/catherinev/quest_maker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/catherinev/quest_maker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/catherinev/quest_maker/teams","hooks_url":"https://api.github.com/repos/catherinev/quest_maker/hooks","issue_events_url":"https://api.github.com/repos/catherinev/quest_maker/issues/events{/number}","events_url":"https://api.github.com/repos/catherinev/quest_maker/events","assignees_url":"https://api.github.com/repos/catherinev/quest_maker/assignees{/user}","branches_url":"https://api.github.com/repos/catherinev/quest_maker/branches{/branch}","tags_url":"https://api.github.com/repos/catherinev/quest_maker/tags","blobs_url":"https://api.github.com/repos/catherinev/quest_maker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/catherinev/quest_maker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/catherinev/quest_maker/git/refs{/sha}","trees_url":"https://api.github.com/repos/catherinev/quest_maker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/catherinev/quest_maker/statuses/{sha}","languages_url":"https://api.github.com/repos/catherinev/quest_maker/languages","stargazers_url":"https://api.github.com/repos/catherinev/quest_maker/stargazers","contributors_url":"https://api.github.com/repos/catherinev/quest_maker/contributors","subscribers_url":"https://api.github.com/repos/catherinev/quest_maker/subscribers","subscription_url":"https://api.github.com/repos/catherinev/quest_maker/subscription","commits_url":"https://api.github.com/repos/catherinev/quest_maker/commits{/sha}","git_commits_url":"https://api.github.com/repos/catherinev/quest_maker/git/commits{/sha}","comments_url":"https://api.github.com/repos/catherinev/quest_maker/comments{/number}","issue_comment_url":"https://api.github.com/repos/catherinev/quest_maker/issues/comments{/number}","contents_url":"https://api.github.com/repos/catherinev/quest_maker/contents/{+path}","compare_url":"https://api.github.com/repos/catherinev/quest_maker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/catherinev/quest_maker/merges","archive_url":"https://api.github.com/repos/catherinev/quest_maker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/catherinev/quest_maker/downloads","issues_url":"https://api.github.com/repos/catherinev/quest_maker/issues{/number}","pulls_url":"https://api.github.com/repos/catherinev/quest_maker/pulls{/number}","milestones_url":"https://api.github.com/repos/catherinev/quest_maker/milestones{/number}","notifications_url":"https://api.github.com/repos/catherinev/quest_maker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/catherinev/quest_maker/labels{/name}","releases_url":"https://api.github.com/repos/catherinev/quest_maker/releases{/id}","created_at":"2015-06-01T01:12:22Z","updated_at":"2015-06-07T04:31:05Z","pushed_at":"2015-06-07T04:30:54Z","git_url":"git://github.com/catherinev/quest_maker.git","ssh_url":"git@github.com:catherinev/quest_maker.git","clone_url":"https://github.com/catherinev/quest_maker.git","svn_url":"https://github.com/catherinev/quest_maker","homepage":"","size":0,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"catherinev:develop","ref":"develop","sha":"6d8d72f7a8bbe0fd131159aad2dcce86fae77452","user":{"login":"catherinev","id":6765017,"avatar_url":"https://avatars.githubusercontent.com/u/6765017?v=3","gravatar_id":"","url":"https://api.github.com/users/catherinev","html_url":"https://github.com/catherinev","followers_url":"https://api.github.com/users/catherinev/followers","following_url":"https://api.github.com/users/catherinev/following{/other_user}","gists_url":"https://api.github.com/users/catherinev/gists{/gist_id}","starred_url":"https://api.github.com/users/catherinev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/catherinev/subscriptions","organizations_url":"https://api.github.com/users/catherinev/orgs","repos_url":"https://api.github.com/users/catherinev/repos","events_url":"https://api.github.com/users/catherinev/events{/privacy}","received_events_url":"https://api.github.com/users/catherinev/received_events","type":"User","site_admin":false},"repo":{"id":36630069,"name":"quest_maker","full_name":"catherinev/quest_maker","owner":{"login":"catherinev","id":6765017,"avatar_url":"https://avatars.githubusercontent.com/u/6765017?v=3","gravatar_id":"","url":"https://api.github.com/users/catherinev","html_url":"https://github.com/catherinev","followers_url":"https://api.github.com/users/catherinev/followers","following_url":"https://api.github.com/users/catherinev/following{/other_user}","gists_url":"https://api.github.com/users/catherinev/gists{/gist_id}","starred_url":"https://api.github.com/users/catherinev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/catherinev/subscriptions","organizations_url":"https://api.github.com/users/catherinev/orgs","repos_url":"https://api.github.com/users/catherinev/repos","events_url":"https://api.github.com/users/catherinev/events{/privacy}","received_events_url":"https://api.github.com/users/catherinev/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/catherinev/quest_maker","description":"make your own quest","fork":false,"url":"https://api.github.com/repos/catherinev/quest_maker","forks_url":"https://api.github.com/repos/catherinev/quest_maker/forks","keys_url":"https://api.github.com/repos/catherinev/quest_maker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/catherinev/quest_maker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/catherinev/quest_maker/teams","hooks_url":"https://api.github.com/repos/catherinev/quest_maker/hooks","issue_events_url":"https://api.github.com/repos/catherinev/quest_maker/issues/events{/number}","events_url":"https://api.github.com/repos/catherinev/quest_maker/events","assignees_url":"https://api.github.com/repos/catherinev/quest_maker/assignees{/user}","branches_url":"https://api.github.com/repos/catherinev/quest_maker/branches{/branch}","tags_url":"https://api.github.com/repos/catherinev/quest_maker/tags","blobs_url":"https://api.github.com/repos/catherinev/quest_maker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/catherinev/quest_maker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/catherinev/quest_maker/git/refs{/sha}","trees_url":"https://api.github.com/repos/catherinev/quest_maker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/catherinev/quest_maker/statuses/{sha}","languages_url":"https://api.github.com/repos/catherinev/quest_maker/languages","stargazers_url":"https://api.github.com/repos/catherinev/quest_maker/stargazers","contributors_url":"https://api.github.com/repos/catherinev/quest_maker/contributors","subscribers_url":"https://api.github.com/repos/catherinev/quest_maker/subscribers","subscription_url":"https://api.github.com/repos/catherinev/quest_maker/subscription","commits_url":"https://api.github.com/repos/catherinev/quest_maker/commits{/sha}","git_commits_url":"https://api.github.com/repos/catherinev/quest_maker/git/commits{/sha}","comments_url":"https://api.github.com/repos/catherinev/quest_maker/comments{/number}","issue_comment_url":"https://api.github.com/repos/catherinev/quest_maker/issues/comments{/number}","contents_url":"https://api.github.com/repos/catherinev/quest_maker/contents/{+path}","compare_url":"https://api.github.com/repos/catherinev/quest_maker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/catherinev/quest_maker/merges","archive_url":"https://api.github.com/repos/catherinev/quest_maker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/catherinev/quest_maker/downloads","issues_url":"https://api.github.com/repos/catherinev/quest_maker/issues{/number}","pulls_url":"https://api.github.com/repos/catherinev/quest_maker/pulls{/number}","milestones_url":"https://api.github.com/repos/catherinev/quest_maker/milestones{/number}","notifications_url":"https://api.github.com/repos/catherinev/quest_maker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/catherinev/quest_maker/labels{/name}","releases_url":"https://api.github.com/repos/catherinev/quest_maker/releases{/id}","created_at":"2015-06-01T01:12:22Z","updated_at":"2015-06-07T04:31:05Z","pushed_at":"2015-06-07T04:30:54Z","git_url":"git://github.com/catherinev/quest_maker.git","ssh_url":"git@github.com:catherinev/quest_maker.git","clone_url":"https://github.com/catherinev/quest_maker.git","svn_url":"https://github.com/catherinev/quest_maker","homepage":"","size":0,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/catherinev/quest_maker/pulls/4"},"html":{"href":"https://github.com/catherinev/quest_maker/pull/4"},"issue":{"href":"https://api.github.com/repos/catherinev/quest_maker/issues/4"},"comments":{"href":"https://api.github.com/repos/catherinev/quest_maker/issues/4/comments"},"review_comments":{"href":"https://api.github.com/repos/catherinev/quest_maker/pulls/4/comments"},"review_comment":{"href":"https://api.github.com/repos/catherinev/quest_maker/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/catherinev/quest_maker/pulls/4/commits"},"statuses":{"href":"https://api.github.com/repos/catherinev/quest_maker/statuses/ecfcbfdf5d1436b5c6c4f7e3a3cf9f8b9abbb1c9"}}}}