Merge branch 'master' of github.com:coursefork/forkshop
Merge branch 'master' of github.com:coursefork/forkshop
Merge branch 'forkme' of git://github.com/matthoffman/forkshop

Conflicts:
	views/course.jade
Move a lot of things around.
gh auth
update index rasters
index image & font tweaks
Button fix
Vector assets in images

for dev
Merge https://github.com/coursefork/forkshop
Simplefried the homepage

Just three icons, like Eric had it at the beginning.
add about page
Massive overhaul, classes, courses.
Merge pull request #15 from martindale/master

Add "Classes" as specific Model
Change "create" to fork a template

Also, move the git calls to be within the original save() callback (thanks Eric)
Merge branch 'master' of git://github.com/eah13/forkshop into eah13-master

Conflicts:
	views/index.jade
Merge remote-tracking branch 'coursefork/master' into forkme

Conflicts:
	views/course.jade
Merge branch 'master' of github.com:coursefork/forkshop
Resolve conflict in index.jade
Merge pull request #16 from martindale/master

Resolve conflict for Elliot