Git project

git/README.md

@@ -92,6 +92,7 @@ git remote add upstream https://github.com/YourGitHandle/Reponame.git
 git checkout <new-branch-name>
 git merge master
 ```
+You can work through this process with the demo `git_project` in this folder.
 
 # Useful Resources
 

git/git_project/Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem 'sinatra'
+
+group :test do
+  gem 'rspec'
+  gem 'rack-test'
+end

git/git_project/Gemfile.lock

@@ -0,0 +1,30 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rack (1.5.2)
+    rack-protection (1.5.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rack-test
+  rspec
+  sinatra

git/git_project/README.md

@@ -0,0 +1,7 @@
+This is a very simple demo app for sudent members of the West Michigan Ruby User Group Traning program to practice using git & github.
+
+If you are a student, please fork this repo: https://github.com/WestMichiganRubyTraining/challenges.git into your own github account, clone the repo onto your development computer, create a new branch, within that branch insert your own github name & link on challenges/git/views/index.html.erb, commit the changes, push the change to your fork, then submit a pull request from your github repo for the original author to authorise the pull request & integrate your change.
+
+Detailed instructions are provided here: https://github.com/WestMichiganRubyTraining/challenges/blob/master/git/README.md
+
+

git/git_project/app.rb

@@ -0,0 +1,6 @@
+require 'sinatra'
+require './lib/app_logic'
+
+get '/' do
+  erb :'index.html'
+end

git/git_project/config.ru

@@ -0,0 +1,3 @@
+require './app.rb'
+
+run Sinatra::Application