Merge pull request #4 from martindale/master

Basic Web Application Template
Merge pull request #5 from martindale/master

Controllers and Views for Courses
Adding github module
Now we can create a new repo
Merge pull request #6 from matthoffman/github-integration

Github integration
Merge branch 'master' of github.com:coursefork/forkshop

Conflicts:
	package.json