github ribbon
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/github-ribbon.png
added grunt update task