misc changes
Add some images
Merge remote-tracking branch 'origin/live'

Conflicts:
	Makefile
	generate
	templates/index.jade
Merge remote-tracking branch 'projects/master'