working on github js
Merge branch 'master' of github.com:shyamraghavan/gitorial

Conflicts:
	views/index.jade