update
Make package.json real json again
Merge branch 'upstream-master'

Conflicts:
	gfms.js
Updated github css to latest version